From 9ff90938886116261a5775b702a1044b0d26ff1d Mon Sep 17 00:00:00 2001 From: "Matteo F. Vescovi" Date: Sat, 31 Dec 2011 12:17:54 +0100 Subject: [PATCH] Imported Upstream version 0.1.6 --- AUTHORS | 2 +- ChangeLog | 404 +++- INSTALL | 10 +- Makefile.am | 7 +- Makefile.in | 10 +- NEWS | 6 + README | 249 +-- aclocal.m4 | 30 +- autogen.sh | 210 +- babl/Babl-0.1.gir | 213 +- babl/Makefile.am | 29 +- babl/Makefile.in | 77 +- babl/babl-component.c | 1 + babl/babl-conversion.c | 16 +- babl/babl-db.h | 3 + babl/babl-extension.c | 2 + babl/babl-fish-stats.c | 46 +- babl/babl-fish.c | 2 + babl/babl-format.c | 39 + babl/babl-format.h | 1 + babl/babl-hash-table.c | 4 +- babl/babl-internal.h | 11 - babl/babl-model.c | 8 + babl/babl-type.c | 1 + babl/babl-version.h | 2 +- babl/babl.h | 7 +- babl/base/Makefile.in | 7 +- babl/base/model-gray.c | 3 +- babl/base/model-ycbcr.c | 5 +- config.guess | 222 +- config.sub | 159 +- configure | 3630 +++++++++++++++++++------------ configure.ac | 53 +- docs/Makefile.in | 7 +- docs/graphics/Makefile.in | 7 +- docs/graphics/babl-16x16.png | Bin 504 -> 504 bytes docs/graphics/babl-48x48.png | Bin 1867 -> 1894 bytes docs/graphics/babl-a4poster.png | Bin 34453 -> 34364 bytes docs/index-static.html.in | 20 +- extensions/Makefile.in | 7 +- extensions/gggl.c | 288 +-- ltmain.sh | 2492 ++++++++++++++------- m4/introspection.m4 | 0 m4/libtool.m4 | 1338 ++++++++---- m4/ltoptions.m4 | 19 +- m4/ltversion.m4 | 12 +- tests/Makefile.in | 7 +- 47 files changed, 6074 insertions(+), 3592 deletions(-) mode change 100755 => 100644 ltmain.sh mode change 100755 => 100644 m4/introspection.m4 diff --git a/AUTHORS b/AUTHORS index 6040b63..ec8d031 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,7 +5,7 @@
Build sanity and optimizations.
Michael Natterer mitch at gimp.org
Build sanity.
-
Kevin Cozens
+
Kevin Cozens kcozens at cvs.gnome.org
Build sanity.
Tim Mooney
Portability fixes.
diff --git a/ChangeLog b/ChangeLog index 870db3d..4d6c021 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,403 @@ +commit 180becb47465ca34bd4ba68c2737bef0c06ad284 +Author: Øyvind Kolås +Date: Fri Nov 18 18:44:58 2011 +0000 + + bump version to 0.1.6 + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletions(-) + +commit a3b2d29554d7c31bfd678dbd02f5d117ab808e55 +Author: Nils Philippsen +Date: Fri Nov 18 17:36:04 2011 +0100 + + build: clean generated vapi file + + babl/Makefile.am | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit cc795367ff5b1bc4d9ff29074ceeb12068822e57 +Author: Øyvind Kolås +Date: Mon Oct 17 18:07:19 2011 +0100 + + build: bump automake requirement to 1.11 + + This is needed for the silent build rules, and probably more. + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d9bab7520d817d27e6eea5af9f92a75c45dc8072 +Author: Javier Jardón +Date: Mon Oct 17 17:04:38 2011 +0100 + + Copy introspection.m4 on tree + + This avoid us to depend on a system installed gobject-introspection + package. + + Makefile.am | 1 + + m4/introspection.m4 | 94 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 95 insertions(+), 0 deletions(-) + +commit 45d8541c24f9437dc34bb6bfbe454a55f7365c88 +Author: Javier Jardón +Date: Mon Oct 17 13:36:42 2011 +0100 + + build: Set automake options in AM_INIT_AUTOMAKE + + Makefile.am | 1 - + configure.ac | 2 +- + 2 files changed, 1 insertions(+), 2 deletions(-) + +commit 1a6c30bded88a01aaf483b5b4ecef461b5ad5b85 +Author: Javier Jardón +Date: Mon Oct 17 13:35:11 2011 +0100 + + Makefile.am: Remove m4/introspection.m4 from EXTRA_DIST + + Makefile.am | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +commit 35f04182c870d238de962c50aba64d6e07990d63 +Author: Javier Jardón +Date: Mon Oct 17 13:21:53 2011 +0100 + + build: Do not use local copy of introspection.m4 + + configure.ac | 2 +- + m4/introspection.m4 | 94 + --------------------------------------------------- + 2 files changed, 1 insertions(+), 95 deletions(-) + +commit 16baeb7a185151643b99034d730e273ad3df1e53 +Author: Javier Jardón +Date: Mon Oct 17 03:00:44 2011 +0100 + + autogen.sh: Use autoreconf instead custom script + + autogen.sh | 210 + ++--------------------------------------------------------- + 1 files changed, 8 insertions(+), 202 deletions(-) + +commit 6db19d1b298c0bddb6bade539d5c7fb5c0c9f316 +Author: Javier Jardón +Date: Mon Oct 17 02:56:07 2011 +0100 + + configure.ac: Replace deprecated AC_STDC_HEADERS macro + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e9d7db77ca8287bb8e7cde8a99297b5555eb19be +Author: Javier Jardón +Date: Mon Oct 17 02:55:08 2011 +0100 + + configure.ac: Use new libtool syntax + + configure.ac | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +commit 9a462946a462bdb67abf2fe67bba2f2b713bb745 +Author: Javier Jardón +Date: Mon Oct 17 02:52:51 2011 +0100 + + configure.ac: Check for AM_SILENT_RULES after AM_INIT_AUTOMAKE + + configure.ac | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +commit 2d261d3c0edbd5efeede0f877db5c00974f394a3 +Author: Javier Jardón +Date: Mon Oct 17 02:50:10 2011 +0100 + + configure.ac: PACKAGE_NAME is already defined by AC_INIT + + configure.ac | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +commit 2425419f9cf807b55cd89f9795849ac51c7cb21f +Author: Javier Jardón +Date: Mon Oct 17 02:48:47 2011 +0100 + + configure.ac: Replace AM_CONFIG_HEADER deprecated macro + + Use AC_CONFIG_HEADERS instead + + configure.ac | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 1a04e6d42b90cd6f7f3054309977b5b986e9e8e9 +Author: Javier Jardón +Date: Mon Oct 17 02:47:21 2011 +0100 + + Makefile.am: honor aclocal flags + + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 3e3f2494b56a7d9ccec170d0a5576c80085e73c0 +Author: Mukund Sivaraman +Date: Tue Sep 13 00:52:06 2011 +0530 + + build: Remove --enable-maintainer-mode as it's now the default + + autogen.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 226dd1678b270ef375ad90c79caddf21d2aa26b9 +Author: Mukund Sivaraman +Date: Tue Sep 13 00:50:21 2011 +0530 + + build: Don't complain about non-GNU make rules + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit a268c654739258f93a1a18087bdd644d8e243355 +Author: Mukund Sivaraman +Date: Tue Sep 13 00:38:29 2011 +0530 + + build: Enable maintainer mode by default + + See + . + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 3ff76afb00023670fbf4a93c847f91a609d6c0b5 +Author: Michael Muré +Date: Fri Aug 19 22:32:07 2011 +0200 + + add the possibility to distinct format_n type from the others + + babl/babl-format.c | 24 ++++++++++++++++++++++++ + babl/babl-format.h | 1 + + babl/babl.h | 5 +++++ + 3 files changed, 30 insertions(+), 0 deletions(-) + +commit 03f6eb4f5b567406b23933b65c868f480ec7abd0 +Author: Jon Nordby +Date: Thu Aug 4 00:45:04 2011 +0200 + + Fix install of babl vapi file + + The pkg-config package refered no longer exists, + and currently only libvala provides a vapidir in pkg-config, + and this package is versioned and changes all the time. + Other projects just use $(datadir)/vala/vapi, so we do the same + + babl/Makefile.am | 2 +- + configure.ac | 3 --- + 2 files changed, 1 insertions(+), 4 deletions(-) + +commit dc292138a3d2817a2086d5ea2847ad8ea4c62271 +Author: Jon Nordby +Date: Wed Aug 3 23:13:29 2011 +0200 + + Build Vala support (.vapi file) by default + + Generated from .gir file. + + babl/.gitignore | 1 + + babl/Makefile.am | 8 ++++++++ + configure.ac | 21 +++++++++++++++++++++ + 3 files changed, 30 insertions(+), 0 deletions(-) + +commit 428598963ed8f50b60ff5a33202dab7afb16c976 +Author: Barak Itkin +Date: Thu Jul 21 17:33:17 2011 +0300 + + Remove trailing space in comments + + babl/babl.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit c440e111aa9283afba3446002cca19c4f23d2d12 +Author: Nils Philippsen +Date: Thu May 26 22:50:57 2011 +0200 + + mask out unwanted formats with if(0) {...} + + premature return statements make source code checkers unhappy + + babl/base/model-ycbcr.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit e46c1706f34c32093143585f58da9c119686035f +Author: Nils Philippsen +Date: Thu May 26 16:04:54 2011 +0200 + + get rid of hack_hack(), use NEEDS_BABL_DB instead + + babl/babl-component.c | 1 + + babl/babl-conversion.c | 1 + + babl/babl-db.h | 3 +++ + babl/babl-extension.c | 1 + + babl/babl-fish.c | 2 ++ + babl/babl-format.c | 1 + + babl/babl-internal.h | 11 ----------- + babl/babl-model.c | 1 + + babl/babl-type.c | 1 + + 9 files changed, 11 insertions(+), 11 deletions(-) + +commit 1332d93c4d36d648f063ada4ae539ec66c1eeea5 +Author: Nils Philippsen +Date: Thu May 26 15:37:09 2011 +0200 + + catch babl_{format,model}_new calls with missing parameters + + babl/babl-format.c | 14 ++++++++++++++ + babl/babl-model.c | 7 +++++++ + 2 files changed, 21 insertions(+), 0 deletions(-) + +commit 9b3a25b2acca835286ce56ec965212cc491fea36 +Author: Nils Philippsen +Date: Thu May 26 12:34:14 2011 +0200 + + add comment about case falling through + + this makes code checker tools happy and the code easier to understand + + babl/babl-extension.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 07dec870b9b16d58665c9b9e734d1f4e6329123a +Author: Nils Philippsen +Date: Thu May 26 12:22:23 2011 +0200 + + fix element size when allocating chain_table + + babl/babl-hash-table.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 2f6038efb34cf0a54e4466409aac244e7406cd8b +Author: Øyvind Kolås +Date: Thu Apr 21 12:00:31 2011 +0100 + + Do not reject colliding conversion names + + Permit registering multiple conversions between the same formats + from the same + extension. Babl was rejecting subsequent conversions/variations in + the same + module; this is desired for most other types of babl objects but not + conversions. + + babl/babl-conversion.c | 15 ++++++++++----- + 1 files changed, 10 insertions(+), 5 deletions(-) + +commit f75d194d77401768654c4faa7bd66409510d97fe +Author: Nils Philippsen +Date: Wed Apr 20 13:43:08 2011 +0200 + + base: don't define and set unused variable + + otherwise gcc 4.6 would warn about it + + babl/base/model-gray.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +commit d4cf61490e75f3fc6623cc43117fca8e69279b3d +Author: Øyvind Kolås +Date: Sun Apr 17 17:58:52 2011 +0100 + + stats: change percentage of pixels needed to be part of negative stats + + babl/babl-fish-stats.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 70e43fcd3d803a5344459b443383eadc7b0ad171 +Author: Øyvind Kolås +Date: Sun Apr 17 17:50:11 2011 +0100 + + extensions: Remove some of the blatantly wrong conversions + + These conversions would never be chosen anyways, even with high + tolerance, but + they are dead code and can just be removed. + + extensions/gggl.c | 288 + +---------------------------------------------------- + 1 files changed, 1 insertions(+), 287 deletions(-) + +commit 6bbf401cbde5414c0e5fef53c3725df7c4aced73 +Author: Øyvind Kolås +Date: Sun Apr 17 17:22:12 2011 +0100 + + stats: remove false negatives from HTML stats output + + too many of the conversions are flagged as bad in the matrix change + code so + that only conversions that contribute to more than 0.1% of the + overall pixels + converted by babl are shown in the stats written when BABL_STATS + environment + variable is set. + + babl/babl-fish-stats.c | 46 + ++++++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 42 insertions(+), 4 deletions(-) + +commit 95345a2afadc9df4eb7bc55f8f1c76e128e8b32f +Author: Rupert Weber +Date: Wed Sep 1 18:16:10 2010 +0200 + + docs: fixed example code in index-static.html.in + + added babl_init(), fish can't be const, Babl* can't be dereferenced, + one variable name changed during example, added sizeof to make it + a little more obvious. + + docs/index-static.html.in | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +commit 9bd82a60e4ae2184dc512e200e89e5e957d6c910 +Author: Rupert Weber +Date: Wed Sep 1 17:54:21 2010 +0200 + + docs: HTML cleanup + + Small HTML cleanups like missing end-tags so page passes + HTML validator. + + AUTHORS | 2 +- + docs/index-static.html.in | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit d96973bc348b860b214e19f6cdefd24a78c745c6 +Author: Jon Nordby +Date: Mon Mar 28 22:16:11 2011 +0200 + + build: Remove --pkg babl option to g-ir-scanner + + --pkg is intended for dependencies. Babl does not depend on Babl + This lead to g-ir-scanner barfing if Babl was not already installed. + + babl/Makefile.am | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit 96637b39d10db0d7e90eced5fe1e09de77bd7b8a +Author: Nils Philippsen +Date: Wed Mar 2 11:42:37 2011 +0100 + + fix building in separate directory + + babl/Makefile.am | 14 +++++++++----- + 1 files changed, 9 insertions(+), 5 deletions(-) + +commit db7b31f1d90d94f81d8a0073df319d686bf189ee +Author: Øyvind Kolås +Date: Thu Jan 20 22:36:19 2011 +0000 + + post release bump to 0.1.5 + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 9a53e93aeaf30a60194f6f5b7b672be7e9cb96d4 Author: Øyvind Kolås Date: Thu Jan 20 22:35:09 2011 +0000 @@ -281,8 +681,8 @@ Date: Fri Jul 16 17:47:47 2010 +0100 autogen.sh, perhaps we should do that instead? This commit should fix building on systems that do not have introspection.m4 in system dirs. - autogen.sh | 1 + - configure.ac | 2 +- + autogen.sh | 1 + + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) commit 09ed3d9bce75243f6f8db807ed3c73441c9333bb diff --git a/INSTALL b/INSTALL index f9fcb37..482bf0b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -babl 0.1.4 +babl 0.1.6 Dynamic; any to any, pixel format conversion library. @@ -12,10 +12,10 @@ From a released version the following is the expected method of installation (or a variation on this theme): ------------------------------------------------------------ - foo$ wget ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.4.tar.bz2 - foo$ tar jxf babl-0.1.4.tar.gz - foo$ cd babl-0.1.4 - foo/babl-0.1.4$ ./configure && make && sudo make install + foo$ wget ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.6.tar.bz2 + foo$ tar jxf babl-0.1.6.tar.gz + foo$ cd babl-0.1.6 + foo/babl-0.1.6$ ./configure && make && sudo make install ------------------------------------------------------------ diff --git a/Makefile.am b/Makefile.am index 23b9f8a..f3da098 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,5 @@ -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} DISTCHECK_CONFIGURE_FLAGS = --enable-introspection -AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ babl \ @@ -23,8 +22,8 @@ EXTRA_DIST = \ TODO \ ChangeLog \ autogen.sh \ - babl.pc.in \ - m4/introspection.m4 + m4/introspection.m4 \ + babl.pc.in DISTCLEANFILES = \ $(built_dist_files) \ diff --git a/Makefile.in b/Makefile.in index bf3b163..b33158d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -201,6 +201,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -230,6 +231,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -238,6 +240,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -285,9 +288,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} DISTCHECK_CONFIGURE_FLAGS = --enable-introspection -AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ babl \ extensions \ @@ -307,8 +309,8 @@ EXTRA_DIST = \ TODO \ ChangeLog \ autogen.sh \ - babl.pc.in \ - m4/introspection.m4 + m4/introspection.m4 \ + babl.pc.in DISTCLEANFILES = \ $(built_dist_files) \ diff --git a/NEWS b/NEWS index 4fc00bb..f8f8c54 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,12 @@ the news section both in the README and the webpage. --> +2011-11-18 babl-0.1.6
+Build improvements, remove blatantly wrong conversions from extensions, +made it possible to distinguish format_n formats from others, improvements +to vala/gobject introspection support. + +
2011-01-20 babl-0.1.4
Improved cross platform build ability, added code to handle n-component formats, remove extraenous runtime profiling that impacted performance. diff --git a/README b/README index eb1d1bb..70e2aba 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Babl-0.1.4 +Babl-0.1.6 Contents @@ -9,7 +9,8 @@ Contents • Usage • Vocabulary • Shortcut Coverage - • Environment Extending + • Environment + • Extending • Directory Overview • Todo • Copyright @@ -58,6 +59,10 @@ babl release. If there are significant improvements to babl when a GEGL release is done a babl release is most often put out just prior to the GEGL release. +2011-11-18 babl-0.1.6 + Build improvements, remove blatantly wrong conversions from + extensions, made it possible to distinguish format_n formats from + others, improvements to vala/gobject introspection support. 2011-01-20 babl-0.1.4 Improved cross platform build ability, added code to handle n-component formats, remove extraenous runtime profiling that @@ -124,17 +129,19 @@ int width = 123, height = 581, pixel_count = width * height; const Babl *srgb = babl_format ("R'G'B' u8"); const Babl *lab = babl_format ("CIE Lab float"); -const Babl *rgb_to_lab_fish = babl_fish (srgb, lab); +Babl *rgb_to_lab_fish = babl_fish (srgb, lab); float *lab_buffer; unsigned char *srgb_buffer; -srgb_buffer = malloc (pixel_count * srgb->format.bytes_per_pixel); -lab_buffer = malloc (pixel_count * 3 * 4); +babl_init (); + +srgb_buffer = malloc (pixel_count * babl_format_get_bytes_per_pixel (srgb)); +lab_buffer = malloc (pixel_count * 3 * sizeof (float)); ...... load data into srgb_buffer ....... -babl_process (bablfish, srgb_buffer, lab_buffer, pixel_count); +babl_process (rgb_to_lab_fish, srgb_buffer, lab_buffer, pixel_count); ...... do operation in lab space ........ @@ -346,15 +353,6 @@ components Cr A -CMYK - -components - - cyan - magenta - yellow - key - CIE Lab components @@ -389,6 +387,15 @@ components CIE H(ab) A +CMYK + +components + + cyan + magenta + yellow + key + Pixel formats RGBA double @@ -1012,58 +1019,6 @@ components u8 Y -CMYK double - -bytes/pixel - 32 -model - CMYK -components - - double cyan - double magenta - double yellow - double key - -CMYK float - -bytes/pixel - 16 -model - CMYK -components - - float cyan - float yellow - float magenta - float key - -B'aG'aR'aA u8 - -bytes/pixel - 4 -model - R'aG'aB'aA -components - - u8 B'a - u8 G'a - u8 R'a - u8 A - -B'aG'aR'aPAD u8 - -bytes/pixel - 4 -model - R'G'B' -components - - u8 B' - u8 G' - u8 R' - u8 PAD - CIE Lab double bytes/pixel @@ -1188,6 +1143,58 @@ components float CIE H(ab) float A +CMYK double + +bytes/pixel + 32 +model + CMYK +components + + double cyan + double magenta + double yellow + double key + +CMYK float + +bytes/pixel + 16 +model + CMYK +components + + float cyan + float yellow + float magenta + float key + +B'aG'aR'aA u8 + +bytes/pixel + 4 +model + R'aG'aB'aA +components + + u8 B'a + u8 G'a + u8 R'a + u8 A + +B'aG'aR'aPAD u8 + +bytes/pixel + 4 +model + R'G'B' +components + + u8 B' + u8 G' + u8 R' + u8 PAD + Shortcut Coverage The diagram shown below visualizes the coverage of current shortcut @@ -1196,78 +1203,78 @@ height of the bar indicates the number of conversions steps needed in a chain of conversions. A DHTML version is also available. - ·· ·▁·· ··· ▁ ▂ ▁▁ ▁ · ···· ── 0 RGBA double + ·· ·▁·· ··· ▁ ▂ ▁▁ ▁ ··· · ── 0 RGBA double ── 1 RGB double ── 2 RaGaBaA double ── 3 R'G'B' double -· ▁ ▁▂▁▁ · ▁ ▂▂ ▂ ▁ ▁▁ ▁ ── 4 R'G'B'A double -· ▁▂▁▁ ▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁▁▁▁ ── 5 R'aG'aB'aA double -▁ ▂ ···▂▂ ▂▂▂ ▁ ▁ ·· ▁▁ ▂ ▁ ▂ ▂▂▂▂ ── 6 R'G'B' u8 -▁ ▁▂ ·▁▂▂ ▂▃▂ · ▁ ▁ ▁▁ ▁ ▂ ▂▂▂▂ ── 7 R'G'B'A u8 -· ▁ ·▁▁ ▁▁▁ ▂ ▃ ·· · ▁ ▁▁▁▁ ── 8 RGBA float -▁ ▃▃ ▂▂ ▃▂▂ ▃ ▂· ▂ ▁ ▂ ▂▂▂▂ ── 9 RGB float -· ▁▁ ▁ ▁ ▁ ▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁ ▁▁ ▁ ──10 Y double -· ▁▁ ▁▂ ▁▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁ ▁▁ ──11 YA double +· ▁ ▁▂▁▁ ▁▁▁ · ▁ ▂▂ ▂ ▁▁▁▁ ▁ ── 4 R'G'B'A double +· ▁▂▁▁ ▁▁▁ ▃ ▂▂ ▂ ▁▁▁▁ ▁ ── 5 R'aG'aB'aA double +▂ ▂ ·▁·▃▃ ▂▂▂ ▁ ▁ ·· ▃▂ ▃ ▁ ▂▂▂▂ ▃ ── 6 R'G'B' u8 +▁ ▁▂ ·▂▃▂ ▂▂▂ · ▁ ▁ ▁▁ ▃ ▃▂▂▂ ▃ ── 7 R'G'B'A u8 +· ▁▁ ·▁▁ ▁▁▁ ▂ ▃ ·· · ▁▁▁▁ ▁ ── 8 RGBA float +▁ ▂▂ ▂▂ ▃▂▂ ▃ ▂▁ ▂ ▁ ▂▂▂▂ ▂ ── 9 RGB float +· ▁▁ ▁ ▁ ▁▁▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁▁▁▁ ▁ ──10 Y double +· ▁▁ ▁▂ ▁▁▁ ▂ ▃ ▂▂ ▂ ▁▁▁▁ ▁ ──11 YA double ──12 YaA double ──13 Y' double ──14 Y'A double -· ▁ ▁▂▁ ▁▁ ▃ ▂▂ ▂ ▁ ▁▁▁▁ ──15 Y'aA double - ▁▂▁▁ ▁ ▂ ▃ ▂▃ ▃ ▂ ▁ ▁▁▁ ──16 Y'CbCr double -· ▁▁ ▁▂▁▁ ▁ ▂ ▃ ▂▂ ▃ ▁ ▁▁▁▁ ──17 Y'CbCrA double +· ▁▁ ▁▂▁▁ ▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁▁ ▁ ──15 Y'aA double +· ▁▁ ▁▂▁▁ ▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁▁▁ ▁ ──16 Y'CbCr double +· ▁ ▁▂▁▁ ▁ ▂ ▃ ▂▂ ▃ ▁▁▁▁ ▁ ──17 Y'CbCrA double ──18 Y'CbCr u8 -▁ · ▂▃▂ ▂ ▂ · ▃▃ ▃ ▂▂ ──19 R'G'B'A float -▂ ▁▃ ▃ ▃ ▃▃▃ ▁ ▁ ▃ ▃▃ ▃ ──20 R'G'B'A u16 - ▃▃▃ ──21 R'aG'aB'aA float +▁ ·▂ ▂▃▂▂ ▂▂▂ · ▃▃ ▃ ▂▂▂▂ ▂ ──19 R'G'B'A float +▂ ▁▃ ▃ ▃▃ ▃▃▃ ▁ ▁ ▃▃▃▃ ▃ ──20 R'G'B'A u16 + ▃▃▃▃ ──21 R'aG'aB'aA float ▃ ▂ ▁ ▂ ──22 R'aG'aB'aA u16 ▃ ▂ ▁ · ▂ ──23 R'aG'aB'aA u8 -▂ ▁▃ ▃ ▃▃ ▃▃▃ · · ▃ ▃▃ ──24 R'G'B' float +▃ ▁▃ ▃ ▃▃ ▃▃▃ · · ▃▃▃▃ ▃ ──24 R'G'B' float ▃ ▂ ▁ ▁ ──25 R'G'B' u16 ▁ · ▁ ▁ ·· ▂ ▁ ──26 Y'A float ▂ ▁ · ▂ ▁ ▁ · ──27 Y'aA float - ▂ ▁ ▁ ▂ · ──28 Y' float + ▂ ▃ ▂ · · ──28 Y' float ▂ ▁ ▂ ▂ ·▁ ▃ ▂ ──29 Y'A u16 ▃ ▂ ▁ ▃ ▁·▂ ▁ ──30 Y'aA u16 - ▃ ▂ ▃ ▁ ▁▂· ──31 Y' u16 -▁ ▂▂ ·▂▂▂ ▂▂▂ ▁ ▂ ▂ ·▁▁ ▃ ▂ ▁▂ ▁·▁▁ ▂ ▂▂▂▂ ──32 Y'A u8 + ▃ ▂ ▂ ▁ ▁▁· ──31 Y' u16 +▁ ▂▃ ·▂▂▂ ▃▂▃ ▁ ▂ ▂ ·▁▁ ▃ ▃ ▁▂ ▂·▁▁ ▂▃▃▃ ▃ ──32 Y'A u8 ▃ ▂ ▁ ▃ ▁·▂ · ──33 Y'aA u8 -▁ ▃▂ ▂▁▂▂ ▂▂▂ ▂ ▂ ▁ ▁▂· ▃▂ ▂ ▁▁▂· ▂ ▂▂▂▂ ──34 Y' u8 -▃ ▂ ▁ ▁ · ──35 Y'CbCr float - ▁▃ ▃ ▃▃ ▃▃ · ▁ ▃ ▃▃▃▃ ──36 Y'CbCrA float -▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ ▁▁ ▁ ▂ ▂▂▂▂ ──37 RGBA u16 -▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ · · ▂ ▂▂▂▂ ──38 RGBA u8 -▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ ▁ ▂ ▂▂▂▂ ──39 RaGaBaA float -▂ ▃▃ ▁▂▃▃ ▃▃▃ ▂ ▂ ▃ ▃▃▃▃ ──40 RaGaBaA u16 -▂ ▃▃ ▁▂▃▃ ▃▃▃ · ▃ ▃▃▃▃ ──41 RaGaBaA u8 -▂ ▃▃ ▁·▃▃ ▃▃▃ ▃▁ ▂ ▃ ▃▃▃▃ ──42 RGB u16 -▁ ▂▂ ▁·▂▃ ▃▂▂ ▃ ·· · ▂ ▃▂▂▂ ──43 RGB u8 -▁ ▂ ·▁▂ ▂▂▂ ▃ ▁▁ ·· ▂ ▂▂▂ ──44 YA float -▂ ▃▃ ▁▂▃▃ ▃▃▃ ▂· ▂ ▃ ▃▃▃▃ ──45 YaA float -▂ ▃▃ ▁· ▃ ▃▃▃ ▂▂ ▃ ▂· ▃ ▃▃▃▃ ──46 Y float -▂ ▃▃ ▁▂▃▃ ▃▃▃ ▂▂ ▂·▁ ▃ ▃▃▃ ──47 YA u16 +▃ ▃▂ ·▁▂▂ ▂▂▂ ▂ ▂ ▁ ▁▂· ▁▃ ▂ ▃▁▂· ▂▂▂▂ ▂ ──34 Y' u8 +▃ ▂ ▁ ▂ · ──35 Y'CbCr float +▂ ▁▃ ▃ ▃▃ ▃▃ · ▁ ▃▃▃▃ ▃ ──36 Y'CbCrA float +▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ ▁▁ ▁ ▂▂▂▂ ▂ ──37 RGBA u16 +▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ · · ▂▂▂▂ ▂ ──38 RGBA u8 +▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ ▁ ▂▂▂▂ ▂ ──39 RaGaBaA float +▂ ▃▃ ▁▂▃▃ ▃▃▃ ▂ ▂ ▃▃▃▃ ▃ ──40 RaGaBaA u16 +▂ ▃▃ ▁▂▃▃ ▃▃▃ · ▃▃▃▃ ▃ ──41 RaGaBaA u8 +▃ ▃▃ ▁·▃▃ ▃▃▃ ▃▂ ▂ ▃▃▃▃ ▃ ──42 RGB u16 +▁ ▃▃ ··▃▃ ▂▃▂ ▃ ·▁ · ▃▃▂▂ ▃ ──43 RGB u8 +▁ ▂▂ ·▁▂ ▂▂▂ ▃ ▁▁ ·· ▂▂▂▂ ▂ ──44 YA float +▂ ▃▃ ▁▂▃▃ ▃▃▃ ▂· ▂ ▃▃▃▃ ▃ ──45 YaA float +▂ ▃▃ ▁· ▃ ▃▃▃ ▂▂ ▃ ▂· ▃▃▃▃ ▃ ──46 Y float +▂ ▃▃ ▁▂▃▃ ▃▃▃ ▂▂ ▂·▁ ▃▃▃▃ ▃ ──47 YA u16 ▃ ▂▃ ▃▁ ▃ · ──48 YaA u16 -▃ ▂▁ ▃▃ ▃▁▁· ──49 Y u16 -▁ ▂▂ ▁▁▂▃ ▂▂▂ ▃ ▁▂ ▁·▁▁ ▂ ▂▂▂▂ ──50 YA u8 +▃ ▂▃ ▃▂ ▃▁▁· ──49 Y u16 +▁ ▃▃ ▁▂▃▃ ▂▂▃ ▃ ▁▂ ▂·▁▁ ▃▃▃▂ ▃ ──50 YA u8 ▃ ▂▃ ▁ ▁·▂ ──51 YaA u8 -▁ ▂▂ ·▁▂▂ ▂▂▂ ▃ ▁▃ ▃ ▃▁▁· ▂ ▂▂▂▂ ──52 Y u8 -· ▁▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁▁ ▁ ──53 CMYK double - ──54 CMYK float - ──55 B'aG'aR'aA u8 - ──56 B'aG'aR'aPAD u8 -· ▁ ▁▂▁▁ ▁▁ ▂ ▃ ▂▃ ▃ ▂ ▁ ▁▁▁ ──57 CIE Lab double -· ▁▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▂▂ ▂ ▁ ──58 CIE Lab alpha double -· ▁▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▃ ▂▃ ▃ ▃ ▁ ▁ ▁ ──59 CIE LCH(ab) double -· ▁ ▁▂▁▁ ▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁▁ ──60 CIE LCH(ab) alpha double - ──61 CIE Lab float - ──62 CIE Lab alpha float - ──63 CIE Lab u8 - ──64 CIE Lab u16 - ──65 CIE LCH(ab) float - ──66 CIE LCH(ab) alpha float +▃ ▂▂ ▃▁▂▂ ▂▂▂ ▃ ▁▃ ▂ ▃▁▁· ▂▂▂▂ ▂ ──52 Y u8 +· ▁▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁▁▁ ▁ ──53 CIE Lab double +· ▁▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▂▂ ▂ ▁▁ ▁ ──54 CIE Lab alpha double +· ▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁ ▁ ▁ ──55 CIE LCH(ab) double +· ▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▂▂ ▂ ▁▁ ▁ ──56 CIE LCH(ab) alpha double + ──57 CIE Lab float + ──58 CIE Lab alpha float + ──59 CIE Lab u8 + ──60 CIE Lab u16 + ──61 CIE LCH(ab) float + ──62 CIE LCH(ab) alpha float +· ▁▁ ▁▂▁▁ ▁▁▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁▁▁▁ ──63 CMYK double + ──64 CMYK float + ──65 B'aG'aR'aA u8 + ──66 B'aG'aR'aPAD u8 ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ||||||||||111111111122222222223333333333444444444455555555556666666 0123456789012345678901234567890123456789012345678901234567890123456 -total length: 2034 -total cost : 543904 +total length: 2171 +total cost : 404497 Environment @@ -1336,7 +1343,7 @@ Sven Neumann sven at gimp.org Build sanity and optimizations. Michael Natterer mitch at gimp.org Build sanity. -Kevin Cozens +Kevin Cozens kcozens at cvs.gnome.org Build sanity. Tim Mooney Portability fixes. @@ -1370,4 +1377,4 @@ Daniel Paredes García danipga at gmail.com Rupert Weber gimp at leguanease.org Documentation and other improvements -/babl-0.1.4 +/babl-0.1.6 diff --git a/aclocal.m4 b/aclocal.m4 index 01ca673..c1f8e25 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, -[m4_warning([this file was generated for autoconf 2.66. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -47,7 +47,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -93,7 +94,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -141,9 +143,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -156,7 +158,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -167,7 +169,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -564,18 +566,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, diff --git a/autogen.sh b/autogen.sh index 41b8d64..aa5b7a9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,213 +9,19 @@ # tools and you shouldn't use this script. Just call ./configure # directly. -ACLOCAL=${ACLOCAL-aclocal} -AUTOCONF=${AUTOCONF-autoconf} -AUTOHEADER=${AUTOHEADER-autoheader} -AUTOMAKE=${AUTOMAKE-automake} -LIBTOOLIZE=${LIBTOOLIZE-libtoolize} +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. -AUTOCONF_REQUIRED_VERSION=2.54 -AUTOMAKE_REQUIRED_VERSION=1.9.6 -LIBTOOL_REQUIRED_VERSION=1.5 - - -PROJECT="BABL" -TEST_TYPE=-d - - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir - -check_version () -{ - VERSION_A=$1 - VERSION_B=$2 - - save_ifs="$IFS" - IFS=. - set dummy $VERSION_A 0 0 0 - MAJOR_A=$2 - MINOR_A=$3 - MICRO_A=$4 - set dummy $VERSION_B 0 0 0 - MAJOR_B=$2 - MINOR_B=$3 - MICRO_B=$4 - IFS="$save_ifs" - - if expr "$MAJOR_A" = "$MAJOR_B" > /dev/null; then - if expr "$MINOR_A" \> "$MINOR_B" > /dev/null; then - echo "yes (version $VERSION_A)" - elif expr "$MINOR_A" = "$MINOR_B" > /dev/null; then - if expr "$MICRO_A" \>= "$MICRO_B" > /dev/null; then - echo "yes (version $VERSION_A)" - else - echo "Too old (version $VERSION_A)" - DIE=1 - fi - else - echo "Too old (version $VERSION_A)" - DIE=1 - fi - elif expr "$MAJOR_A" \> "$MAJOR_B" > /dev/null; then - echo "Major version might be too new ($VERSION_A)" - else - echo "Too old (version $VERSION_A)" - DIE=1 - fi -} - -echo -echo "I am testing that you have the tools required to build the" -echo "$PROJECT project from git. This test is not foolproof," -echo "so if anything goes wrong, see the file HACKING for more information..." -echo - -DIE=0 - - -echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... " -if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=$LIBTOOLIZE -elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=glibtoolize -else - echo - echo " You must have libtool installed to compile $PROJECT." - echo " Install the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - echo - DIE=1 -fi - -if test x$LIBTOOLIZE != x; then - VER=`$LIBTOOLIZE --version \ - | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $LIBTOOL_REQUIRED_VERSION -fi - - -echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... " -if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then - VER=`$AUTOCONF --version | head -n 1 \ - | grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $AUTOCONF_REQUIRED_VERSION -else - echo - echo " You must have autoconf installed to compile $PROJECT." - echo " Download the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/" - echo - DIE=1; -fi - - -echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " -if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=$AUTOMAKE - ACLOCAL=$ACLOCAL -elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.11 - ACLOCAL=aclocal-1.11 -elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.10 - ACLOCAL=aclocal-1.10 -elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.9 - ACLOCAL=aclocal-1.9 -else - echo - echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT." - echo " Download the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/" - echo - DIE=1 -fi - -if test x$AUTOMAKE != x; then - VER=`$AUTOMAKE --version \ - | grep automake | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $AUTOMAKE_REQUIRED_VERSION +AUTORECONF=`which autoreconf` +if test -z $AUTORECONF; then + echo "*** No autoreconf found, please intall it ***" + exit 1 fi - -if test "$DIE" -eq 1; then - echo - echo "Please install/upgrade the missing tools and call me again." - echo - exit 1 -fi - - -echo -echo "I am going to run ./configure with the following arguments:" -echo -echo " --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@" -echo - -if test -z "$*"; then - echo "If you wish to pass additional arguments, please specify them " - echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS " - echo "environment variable." - echo -fi - - -ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" -if test -z "$ACLOCAL_FLAGS"; then - - acdir=`$ACLOCAL --print-ac-dir` - m4list="pkg.m4" - - for file in $m4list - do - if [ ! -f "$acdir/$file" ]; then - echo - echo "WARNING: aclocal's directory is $acdir, but..." - echo " no file $acdir/$file" - echo " You may see fatal macro warnings below." - echo " If these files are installed in /some/dir, set the " - echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\"" - echo " or install $acdir/$file." - echo - fi - done -fi - -rm -rf autom4te.cache - -$ACLOCAL $ACLOCAL_FLAGS -RC=$? -if test $RC -ne 0; then - echo "$ACLOCAL gave errors. Please fix the error conditions and try again." - exit $RC -fi - -$LIBTOOLIZE --force || exit $? - -# optionally feature autoheader -($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 && $AUTOHEADER || exit 1 - -$AUTOMAKE --add-missing || exit $? -$AUTOCONF || exit $? +autoreconf --force --install --verbose cd $ORIGDIR - -echo -echo "Running ./configure..." -echo - -$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" -RC=$? -if test $RC -ne 0; then - echo - echo "Configure failed or did not finish!" - exit $RC -fi - -echo -echo "Now type 'make' to compile $PROJECT." +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/babl/Babl-0.1.gir b/babl/Babl-0.1.gir index 0326d54..7ed6489 100644 --- a/babl/Babl-0.1.gir +++ b/babl/Babl-0.1.gir @@ -2,121 +2,125 @@ - - - - + c:identifier-prefixes="Babl" + c:symbol-prefixes="babl"> + + - + - - - - - - - - - - - - + - + - + - + - + - + - + - + - - - + + + - + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - - - + + + @@ -127,12 +131,12 @@ and/or use gtk-doc annotations. --> - - + + - + @@ -143,12 +147,12 @@ and/or use gtk-doc annotations. --> - - + + - + @@ -161,22 +165,22 @@ and/or use gtk-doc annotations. --> - - - + + + - + - + - - - + + + @@ -184,28 +188,30 @@ and/or use gtk-doc annotations. --> - - - + + + - + - + - - + + - + @@ -218,23 +224,14 @@ and/or use gtk-doc annotations. --> - - - - - - - - + + + + + + + + @@ -243,9 +240,9 @@ and/or use gtk-doc annotations. --> - - - + + + @@ -256,12 +253,12 @@ and/or use gtk-doc annotations. --> - - + + - + @@ -269,22 +266,22 @@ and/or use gtk-doc annotations. --> - - - + + + - + - + - - - + + + @@ -293,12 +290,12 @@ and/or use gtk-doc annotations. --> - - + + - + diff --git a/babl/Makefile.am b/babl/Makefile.am index 6abf148..93c2657 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -61,11 +61,14 @@ h_sources = \ babl-util.h library_includedir=$(includedir)/babl-$(BABL_API_VERSION)/babl -library_include_HEADERS = \ - babl-macros.h \ - babl-types.h \ - babl-version.h \ +libinc_hdrs = \ + babl-macros.h \ + babl-types.h \ babl.h +libinc_generated_hdrs = \ + babl-version.h +library_include_HEADERS = \ + $(libinc_hdrs) $(libinc_generated_hdrs) AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ @@ -95,11 +98,11 @@ Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sou --library=babl-$(BABL_API_VERSION) \ --libtool="$(LIBTOOL)" \ --output $@ \ - --pkg babl \ -DBABL_IS_BEING_COMPILED \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(addprefix $(srcdir)/, $(library_include_HEADERS)) \ + $(addprefix $(srcdir)/, $(libinc_hdrs)) \ + $(addprefix $(builddir)/, $(libinc_generated_hdrs)) \ $(addprefix $(srcdir)/, $(c_sources)) girdir = $(datadir)/gir-1.0 @@ -108,9 +111,6 @@ gir_DATA = Babl-$(BABL_API_VERSION).gir typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = Babl-$(BABL_API_VERSION).typelib -EXTRA_DIST = $(gir_DATA) -CLEANFILES = $(gir_DATA) $(typelibs_DATA) - %.typelib: %.gir LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ @@ -118,5 +118,16 @@ CLEANFILES = $(gir_DATA) $(typelibs_DATA) $(G_IR_COMPILER_OPTS) \ $< -o $@ +if HAVE_VALA +babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir + $(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir + +vapidir=$(datadir)/vala/vapi +vapi_DATA = babl-$(BABL_API_VERSION).vapi + +endif # HAVE_VALA endif # HAVE_INTROSPECTION + +EXTRA_DIST = $(gir_DATA) +CLEANFILES = $(gir_DATA) $(typelibs_DATA) $(vapi_DATA) diff --git a/babl/Makefile.in b/babl/Makefile.in index 560f84d..4413ca1 100644 --- a/babl/Makefile.in +++ b/babl/Makefile.in @@ -74,7 +74,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ - "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(library_includedir)" + "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(vapidir)" \ + "$(DESTDIR)$(library_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libbabl_@BABL_API_VERSION@_la_DEPENDENCIES = base/libbase.la \ @LTLIBOBJS@ $(am__empty) @@ -133,7 +134,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -DATA = $(gir_DATA) $(typelibs_DATA) +DATA = $(gir_DATA) $(typelibs_DATA) $(vapi_DATA) HEADERS = $(library_include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -233,6 +234,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -262,6 +264,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -270,6 +273,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -374,12 +378,17 @@ h_sources = \ babl-util.h library_includedir = $(includedir)/babl-$(BABL_API_VERSION)/babl -library_include_HEADERS = \ - babl-macros.h \ - babl-types.h \ - babl-version.h \ +libinc_hdrs = \ + babl-macros.h \ + babl-types.h \ babl.h +libinc_generated_hdrs = \ + babl-version.h + +library_include_HEADERS = \ + $(libinc_hdrs) $(libinc_generated_hdrs) + AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -I$(top_srcdir) \ @@ -402,8 +411,10 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) @HAVE_INTROSPECTION_TRUE@gir_DATA = Babl-$(BABL_API_VERSION).gir @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0 @HAVE_INTROSPECTION_TRUE@typelibs_DATA = Babl-$(BABL_API_VERSION).typelib -@HAVE_INTROSPECTION_TRUE@EXTRA_DIST = $(gir_DATA) -@HAVE_INTROSPECTION_TRUE@CLEANFILES = $(gir_DATA) $(typelibs_DATA) +@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapidir = $(datadir)/vala/vapi +@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapi_DATA = babl-$(BABL_API_VERSION).vapi +EXTRA_DIST = $(gir_DATA) +CLEANFILES = $(gir_DATA) $(typelibs_DATA) $(vapi_DATA) all: all-recursive .SUFFIXES: @@ -417,9 +428,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu babl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign babl/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu babl/Makefile + $(AUTOMAKE) --foreign babl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -577,6 +588,26 @@ uninstall-typelibsDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files +install-vapiDATA: $(vapi_DATA) + @$(NORMAL_INSTALL) + test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" + @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vapidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(vapidir)" || exit $$?; \ + done + +uninstall-vapiDATA: + @$(NORMAL_UNINSTALL) + @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(vapidir)" && rm -f $$files install-library_includeHEADERS: $(library_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_includedir)" @@ -796,7 +827,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(library_includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(library_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -849,7 +880,7 @@ info: info-recursive info-am: install-data-am: install-girDATA install-library_includeHEADERS \ - install-typelibsDATA + install-typelibsDATA install-vapiDATA install-dvi: install-dvi-recursive @@ -896,7 +927,8 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - uninstall-library_includeHEADERS uninstall-typelibsDATA + uninstall-library_includeHEADERS uninstall-typelibsDATA \ + uninstall-vapiDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -912,13 +944,13 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ install-info install-info-am install-libLTLIBRARIES \ install-library_includeHEADERS install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ - install-typelibsDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-girDATA \ + install-typelibsDATA install-vapiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-girDATA \ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS \ - uninstall-typelibsDATA + uninstall-typelibsDATA uninstall-vapiDATA # GObject Introspection @@ -930,11 +962,11 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ @HAVE_INTROSPECTION_TRUE@ --library=babl-$(BABL_API_VERSION) \ @HAVE_INTROSPECTION_TRUE@ --libtool="$(LIBTOOL)" \ @HAVE_INTROSPECTION_TRUE@ --output $@ \ -@HAVE_INTROSPECTION_TRUE@ --pkg babl \ @HAVE_INTROSPECTION_TRUE@ -DBABL_IS_BEING_COMPILED \ @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ -@HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(library_include_HEADERS)) \ +@HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(libinc_hdrs)) \ +@HAVE_INTROSPECTION_TRUE@ $(addprefix $(builddir)/, $(libinc_generated_hdrs)) \ @HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(c_sources)) @HAVE_INTROSPECTION_TRUE@%.typelib: %.gir @@ -944,6 +976,9 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ @HAVE_INTROSPECTION_TRUE@ $(G_IR_COMPILER_OPTS) \ @HAVE_INTROSPECTION_TRUE@ $< -o $@ +@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir +@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@ $(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/babl/babl-component.c b/babl/babl-component.c index 0d03647..65e8767 100644 --- a/babl/babl-component.c +++ b/babl/babl-component.c @@ -17,6 +17,7 @@ */ #include "config.h" +#define NEEDS_BABL_DB #include "babl-internal.h" #include "babl-db.h" #include diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c index ea6be81..446979d 100644 --- a/babl/babl-conversion.c +++ b/babl/babl-conversion.c @@ -21,6 +21,7 @@ #include #include #include +#define NEEDS_BABL_DB #include "babl-internal.h" #include "babl-db.h" @@ -137,13 +138,15 @@ conversion_new (const char *name, } static char buf[512] = ""; +static int collisions = 0; static char * create_name (Babl *source, Babl *destination, int type) { if (babl_extender ()) { - snprintf (buf, 512 - 1, "%s : %s%s to %s", + snprintf (buf, 512 - 1, "%s %i: %s%s to %s", BABL (babl_extender ())->instance.name, + collisions, type == BABL_CONVERSION_LINEAR ? "" : type == BABL_CONVERSION_PLANE ? "plane " : type == BABL_CONVERSION_PLANAR ? "planar " : "Eeeek! ", @@ -253,15 +256,18 @@ babl_conversion_new (void *first_arg, type = BABL_CONVERSION_PLANAR; } + collisions = 0; name = create_name (source, destination, type); babl = babl_db_exist (db, id, name); - if (babl) + while (babl) { - /* There is an instance already registered by the required id/name, - * returning the preexistent one instead. + /* we allow multiple conversions to be registered per extender, each + of them ending up with their own unique name */ - return babl; + collisions++; + name = create_name (source, destination, type); + babl = babl_db_exist (db, id, name); } babl = conversion_new (name, id, source, destination, linear, plane, planar); diff --git a/babl/babl-db.h b/babl/babl-db.h index a07a17b..d576e6c 100644 --- a/babl/babl-db.h +++ b/babl/babl-db.h @@ -38,6 +38,9 @@ typedef struct _BablDb BablMutex *mutex; } _BablDb; +#ifdef NEEDS_BABL_DB +static BablDb *db = NULL; +#endif /* NEEDS_BABL_DB */ BablDb * babl_db_init (void); diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 1973588..d021914 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -27,6 +27,7 @@ #define BABL_INIT_HOOK init_hook (); dynamic_init_hook (); #endif +#define NEEDS_BABL_DB #include "babl-internal.h" #include "babl-db.h" #include "babl-base.h" @@ -326,6 +327,7 @@ babl_extension_load_dir_list (const char *dir_list) { case '\0': eos = 1; + /* don't break here, the path needs to be processed */ case BABL_PATH_SEPARATOR: { diff --git a/babl/babl-fish-stats.c b/babl/babl-fish-stats.c index 7b853b1..f4893db 100644 --- a/babl/babl-fish-stats.c +++ b/babl/babl-fish-stats.c @@ -29,6 +29,41 @@ static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; */ +static double sum_pixels = 0.0; + +static int +table_destination_sum_each (Babl *babl, + void *userdata) +{ + Babl *source = userdata; + Babl *destination = babl; + + if (source != destination) + { + Babl *fish = babl_fish (source, destination); + babl_assert (fish); + sum_pixels += fish->fish.pixels; + } + return 0; +} + +static int +table_source_sum_each (Babl *babl, + void *userdata) +{ + babl_format_class_for_each (table_destination_sum_each, babl); + return 0; +} + +static void +table_sum_processings_calc (void) +{ + sum_pixels = 0; + babl_format_class_for_each (table_source_sum_each, NULL); +} + +#define LIMIT 0.03 + static int table_destination_each (Babl *babl, void *userdata) @@ -51,7 +86,7 @@ table_destination_each (Babl *babl, case BABL_FISH_PATH: fprintf (output_file, "%s", - fish->fish.processings > 0 ? " style='background-color: #69f'" : "", + fish->fish.pixels / sum_pixels > LIMIT ? " style='background-color: #69f'" : "", utf8_bar[babl_list_size (fish->fish_path.conversion_list)]); { @@ -95,11 +130,11 @@ table_destination_each (Babl *babl, case BABL_FISH_REFERENCE: fprintf (output_file, " ", - fish->fish.processings > 0 ? " style='background-color: #f99'" : ""); + fish->fish.pixels / sum_pixels > LIMIT ? " style='background-color: #f99'" : ""); fprintf (output_file, "
"); fprintf (output_file, "

Reference %s to %s

", source->instance.name, destination->instance.name); - if (fish->fish.processings > 0) + if (fish->fish.processings > 1) { fprintf (output_file, "Processings:%i
", fish->fish.processings); fprintf (output_file, "Pixels:%li
", fish->fish.pixels); @@ -110,7 +145,7 @@ table_destination_each (Babl *babl, case BABL_FISH_SIMPLE: fprintf (output_file, "·", - fish->fish.processings > 1 ? " style='background-color: #69f'" : ""); + fish->fish.pixels / sum_pixels > LIMIT ? " style='background-color: #69f'" : ""); fprintf (output_file, "
"); fprintf (output_file, "

Simple %s to %s

", source->instance.name, destination->instance.name); @@ -138,6 +173,8 @@ table_destination_each (Babl *babl, static int source_no = 0; + + static int table_source_each (Babl *babl, void *userdata) @@ -264,6 +301,7 @@ babl_fish_stats (FILE *file) { output_file = file; + table_sum_processings_calc (); fprintf (output_file, "\n" "\n" diff --git a/babl/babl-fish.c b/babl/babl-fish.c index dad518b..67e53fb 100644 --- a/babl/babl-fish.c +++ b/babl/babl-fish.c @@ -17,7 +17,9 @@ */ #include "config.h" +#define NEEDS_BABL_DB #include "babl-internal.h" +#include "babl-db.h" #include #include #include diff --git a/babl/babl-format.c b/babl/babl-format.c index 3760452..463a92b 100644 --- a/babl/babl-format.c +++ b/babl/babl-format.c @@ -21,6 +21,7 @@ #include #include +#define NEEDS_BABL_DB #include "babl-internal.h" #include "babl-db.h" @@ -111,6 +112,7 @@ format_new (const char *name, babl->format.loss = -1.0; babl->format.visited = 0; babl->format.image_template = NULL; + babl->format.format_n = 0; return babl; } @@ -194,6 +196,15 @@ ncomponents_create_name (Babl *type, return babl_strdup (buf); } +static void +babl_format_set_is_format_n (Babl *format) +{ + if (format->class_type == BABL_FORMAT) + { + format->format.format_n = 1; + } +} + Babl * babl_format_n (Babl *btype, int components) @@ -231,11 +242,25 @@ babl_format_n (Babl *btype, planar, components, model, component, sampling, type); + babl_format_set_is_format_n (babl); + babl_db_insert (db, babl); babl_free (name); return babl; } +int +babl_format_is_format_n (Babl *format) +{ + if (format->class_type == BABL_FORMAT) + { + return format->format.format_n; + } + + return 0; +} + + static int is_format_duplicate (Babl *babl, int planar, @@ -384,6 +409,20 @@ babl_format_new (void *first_arg, if (!name) name = create_name (model, components, component, type); + if (!model) + { + babl_log ("no model specified for format '%s'", name); + babl_free(name); + return NULL; + } + + if (!components) + { + babl_log ("no components specified for format '%s'", name); + babl_free(name); + return NULL; + } + babl = babl_db_exist (db, id, name); if (id && !babl && babl_db_exist (db, 0, name)) babl_fatal ("Trying to reregister BablFormat '%s' with different id!", name); diff --git a/babl/babl-format.h b/babl/babl-format.h index fb8dfac..68fc87d 100644 --- a/babl/babl-format.h +++ b/babl/babl-format.h @@ -39,6 +39,7 @@ typedef struct from and to RGBA double */ int visited; /* for convenience in code while searching for conversion paths */ + int format_n; /* whether the format is a format_n type or not */ } BablFormat; #endif diff --git a/babl/babl-hash-table.c b/babl/babl-hash-table.c index 99b7427..d507cb2 100644 --- a/babl/babl-hash-table.c +++ b/babl/babl-hash-table.c @@ -119,7 +119,7 @@ hash_rehash (BablHashTable *htab) if (nhtab->mask) { nhtab->data_table = babl_calloc (sizeof (BablInstance *), babl_hash_table_size(nhtab)); - nhtab->chain_table = babl_malloc (sizeof (int *) * babl_hash_table_size(nhtab)); + nhtab->chain_table = babl_malloc (sizeof (int) * babl_hash_table_size(nhtab)); memset (nhtab->chain_table, -1, sizeof (int) * babl_hash_table_size(nhtab)); } @@ -175,7 +175,7 @@ babl_hash_table_init (BablHashValFunction hfunc, if (htab->mask) { htab->data_table = babl_calloc (sizeof (BablInstance *), babl_hash_table_size(htab)); - htab->chain_table = babl_malloc (sizeof (int *) * babl_hash_table_size(htab)); + htab->chain_table = babl_malloc (sizeof (int) * babl_hash_table_size(htab)); memset (htab->chain_table, -1, sizeof (int) * babl_hash_table_size(htab)); } diff --git a/babl/babl-internal.h b/babl/babl-internal.h index da5f923..fbc45c3 100644 --- a/babl/babl-internal.h +++ b/babl/babl-internal.h @@ -112,16 +112,6 @@ Babl * babl_format_with_model_as_type (Babl *model, int babl_formats_count (void); /* should maybe be templated? */ int babl_type_is_symmetric (Babl *babl); -/* FIXME: nasty,. including the symbol even in files where it is - * not needed,. and a dummy function to use it in those cases - */ -static BablDb *db=NULL; -static void hack_hack (void) -{ - if (db==NULL) - db=NULL; -} - /**** LOGGER ****/ #include @@ -152,7 +142,6 @@ real_babl_log (const char *file, fprintf (stdout, "\n"); fflush (NULL); return; - hack_hack (); } /* Provide a string identifying the current function, non-concatenatable */ diff --git a/babl/babl-model.c b/babl/babl-model.c index be2cdde..df71be4 100644 --- a/babl/babl-model.c +++ b/babl/babl-model.c @@ -20,6 +20,7 @@ #include #include #include +#define NEEDS_BABL_DB #include "babl-internal.h" #include "babl-db.h" @@ -183,6 +184,13 @@ babl_model_new (void *first_argument, else name = babl_model_create_name (components, component); + if (!components) + { + babl_log("no components specified for model '%s'", name); + babl_free(name); + return NULL; + } + babl = babl_db_exist (db, id, name); if (id && !babl && babl_db_exist (db, 0, name)) babl_fatal ("Trying to reregister BablModel '%s' with different id!", name); diff --git a/babl/babl-type.c b/babl/babl-type.c index 1bf7a07..b838860 100644 --- a/babl/babl-type.c +++ b/babl/babl-type.c @@ -21,6 +21,7 @@ #include #include +#define NEEDS_BABL_DB #include "babl-internal.h" #include "babl-db.h" diff --git a/babl/babl-version.h b/babl/babl-version.h index 461913d..9086953 100644 --- a/babl/babl-version.h +++ b/babl/babl-version.h @@ -34,7 +34,7 @@ #define BABL_MAJOR_VERSION 0 #define BABL_MINOR_VERSION 1 -#define BABL_MICRO_VERSION 4 +#define BABL_MICRO_VERSION 6 /** Get the version information on the babl library */ void babl_get_version (int *major, diff --git a/babl/babl.h b/babl/babl.h index 1ad2ea7..2c248a5 100644 --- a/babl/babl.h +++ b/babl/babl.h @@ -174,7 +174,7 @@ Babl * babl_format_new (void *first_arg, /* * Defines a new pixel format in babl. With the specified data storage - * type and the given number of components. At the moment behavior of + * type and the given number of components. At the moment behavior of * conversions are only well defined to other babl_format_n derived formats * with the same number of components. */ @@ -182,6 +182,11 @@ Babl * babl_format_n (Babl *type, int components); +/** + * Returns whether the @format is a format_n type. + */ +int babl_format_is_format_n (Babl *format); + /** * Defines a new conversion between either two formats, two models or * two types in babl. diff --git a/babl/base/Makefile.in b/babl/base/Makefile.in index 774e142..a08d93c 100644 --- a/babl/base/Makefile.in +++ b/babl/base/Makefile.in @@ -155,6 +155,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -184,6 +185,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -192,6 +194,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -274,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu babl/base/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign babl/base/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu babl/base/Makefile + $(AUTOMAKE) --foreign babl/base/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c index e6b907c..5582c78 100644 --- a/babl/base/model-gray.c +++ b/babl/base/model-gray.c @@ -143,12 +143,11 @@ rgba_to_gray (char *src, while (n--) { double red, green, blue; - double luminance, alpha; + double luminance; red = ((double *) src)[0]; green = ((double *) src)[1]; blue = ((double *) src)[2]; - alpha = ((double *) src)[3]; luminance = red * RGB_LUMINANCE_RED + green * RGB_LUMINANCE_GREEN + diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c index 13f3581..6a6370e 100644 --- a/babl/base/model-ycbcr.c +++ b/babl/base/model-ycbcr.c @@ -253,8 +253,10 @@ formats (void) babl_sampling (2, 2), babl_component_from_id (BABL_CR), NULL); - return; +/* deactivate these for now */ +if (0) +{ babl_format_new ( "name", "y'cbcr420", "id", BABL_YCBCR420, @@ -301,3 +303,4 @@ formats (void) babl_component_from_id (BABL_CR), NULL); } +} diff --git a/config.guess b/config.guess index dc84c68..40eaed4 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2011-05-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +484,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +555,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +598,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +734,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +773,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -804,14 +808,14 @@ EOF echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -866,7 +870,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,7 +882,13 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -891,7 +901,7 @@ EOF echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -959,7 +969,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,6 +977,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -974,7 +987,7 @@ EOF echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +996,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1032,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1060,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1101,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1145,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1174,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,6 +1243,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1275,13 +1291,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1321,11 +1337,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.sub b/config.sub index 2a55a50..30fdca8 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,8 +75,9 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,8 +124,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -156,8 +158,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -281,11 +283,13 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -293,15 +297,24 @@ case $basic_machine in | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -313,6 +326,18 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -333,7 +358,7 @@ case $basic_machine in | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -367,25 +392,28 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +438,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +508,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +553,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -732,7 +769,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -839,6 +876,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +964,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1061,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,17 +1120,10 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu ;; tile*) basic_machine=tile-unknown @@ -1156,6 +1196,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1296,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1294,7 +1337,8 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1385,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1434,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1479,8 @@ case $os in -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1503,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1518,17 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1500,7 +1555,7 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1582,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/configure b/configure index 6fd3e56..66b4669 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for babl 0.1.4. +# Generated by GNU Autoconf 2.68 for babl 0.1.6. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -89,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -222,11 +223,18 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -559,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='babl' PACKAGE_TARNAME='babl' -PACKAGE_VERSION='0.1.4' -PACKAGE_STRING='babl 0.1.4' +PACKAGE_VERSION='0.1.6' +PACKAGE_STRING='babl 0.1.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -634,7 +642,9 @@ OTOOL LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL RANLIB +ac_ct_AR AR LN_S NM @@ -645,10 +655,6 @@ FGREP EGREP GREP SED -LIBTOOL -OBJDUMP -DLLTOOL -AS host_os host_vendor host_cpu @@ -657,6 +663,10 @@ build_os build_vendor build_cpu build +LIBTOOL +OBJDUMP +DLLTOOL +AS CPP am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -674,6 +684,8 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -702,6 +714,9 @@ BABL_LIBRARY_VERSION BABL_UNSTABLE BABL_UNSTABLE_FALSE BABL_UNSTABLE_TRUE +HAVE_VALA_FALSE +HAVE_VALA_TRUE +VAPIGEN HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -724,8 +739,6 @@ BABL_INTERFACE_AGE BABL_MICRO_VERSION BABL_MINOR_VERSION BABL_MAJOR_VERSION -AM_BACKSLASH -AM_DEFAULT_VERBOSITY target_alias host_alias build_alias @@ -767,14 +780,16 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_silent_rules enable_introspection +with_vala +enable_silent_rules enable_dependency_tracking enable_static enable_shared with_pic enable_fast_install with_gnu_ld +with_sysroot enable_libtool_lock enable_maintainer_mode enable_mmx @@ -855,8 +870,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1196,7 +1212,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1334,7 +1350,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures babl 0.1.4 to adapt to many kinds of systems. +\`configure' configures babl 0.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1404,7 +1420,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of babl 0.1.4:";; + short | recursive ) echo "Configuration of babl 0.1.6:";; esac cat <<\_ACEOF @@ -1412,10 +1428,10 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') --enable-introspection=[no/auto/yes] Enable introspection for this build + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-static[=PKGS] build static libraries [default=no] @@ -1423,7 +1439,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-maintainer-mode enable make rules and dependencies not useful + --disable-maintainer-mode disable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-mmx enable MMX support (default=auto) --enable-sse enable SSE support (default=auto) @@ -1432,9 +1448,12 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --without-vala build without Vala support + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). Some influential environment variables: PKG_CONFIG path to pkg-config utility @@ -1517,8 +1536,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -babl configure 0.1.4 -generated by GNU Autoconf 2.66 +babl configure 0.1.6 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1564,7 +1583,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1590,7 +1609,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1601,7 +1620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1647,7 +1666,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1661,7 +1680,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1679,7 +1698,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1720,7 +1739,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1733,7 +1752,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1788,7 +1807,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1800,10 +1819,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1839,7 +1858,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1866,7 +1885,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1875,15 +1894,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by babl $as_me 0.1.4, which was -generated by GNU Autoconf 2.66. Invocation command line was +It was created by babl $as_me 0.1.6, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2231,31 +2250,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_config_headers="$ac_config_headers config.h" -# Enable silent build rules by default, requires at least -# Automake-1.11. Disable by either passing --disable-silent-rules to -# configure or passing V=1 to make -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; -esac -AM_BACKSLASH='\' BABL_MAJOR_VERSION=0 BABL_MINOR_VERSION=1 -BABL_MICRO_VERSION=4 +BABL_MICRO_VERSION=6 BABL_INTERFACE_AGE=1 -BABL_BINARY_AGE=104 -BABL_VERSION=0.1.4 -BABL_REAL_VERSION=0.1.4 +BABL_BINARY_AGE=106 +BABL_VERSION=0.1.6 +BABL_REAL_VERSION=0.1.6 BABL_API_VERSION=0.1 @@ -2276,13 +2282,14 @@ BABL_RELEASE=0.1 + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -2325,7 +2332,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -2419,20 +2426,20 @@ else as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 fi if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.10") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then found_introspection=yes else - as_fn_error $? "You need to have gobject-introspection >= 0.6.8 installed to build babl" "$LINENO" 5 + as_fn_error $? "You need to have gobject-introspection >= 0.10 installed to build babl" "$LINENO" 5 fi ;; #( auto) : if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.10") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then @@ -2483,6 +2490,77 @@ fi +# Vala + +# Check whether --with-vala was given. +if test "${with_vala+set}" = set; then : + withval=$with_vala; +fi + + +have_vapigen="no" +if test "x$with_vala" != "xno"; then + + # Extract the first word of "vapigen", so it can be a program name with args. +set dummy vapigen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_VAPIGEN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $VAPIGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_VAPIGEN="$VAPIGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_VAPIGEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_VAPIGEN" && ac_cv_path_VAPIGEN="no" + ;; +esac +fi +VAPIGEN=$ac_cv_path_VAPIGEN +if test -n "$VAPIGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VAPIGEN" >&5 +$as_echo "$VAPIGEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$VAPIGEN" = "no"; then + have_vapigen="no (vapigen executable not found)" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Check for vapigen failed." >&5 +$as_echo "*** Check for vapigen failed." >&6; } + else + have_vapigen="yes" + fi +fi + +have_vala=$have_vapigen + if test "$have_vala" = "yes"; then + HAVE_VALA_TRUE= + HAVE_VALA_FALSE='#' +else + HAVE_VALA_TRUE='#' + HAVE_VALA_FALSE= +fi + + BABL_UNSTABLE=yes if test "x$BABL_UNSTABLE" = "xyes"; then @@ -2504,15 +2582,11 @@ fi -BABL_LIBRARY_VERSION="103:1:103" +BABL_LIBRARY_VERSION="105:1:105" BABL_CURRENT_MINUS_AGE=0 -PACKAGE_NAME=babl - - - am__api_version='1.11' @@ -2562,7 +2636,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2739,7 +2813,7 @@ if test "$cross_compiling" != no; then set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2779,7 +2853,7 @@ if test -z "$ac_cv_prog_STRIP"; then set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2832,7 +2906,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2883,7 +2957,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2923,7 +2997,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2981,7 +3055,7 @@ fi # Define the identity of the package. PACKAGE='babl' - VERSION='0.1.4' + VERSION='0.1.6' # Some tools Automake needs. @@ -3012,7 +3086,21 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -ac_config_headers="$ac_config_headers config.h" + +# Enable silent build rules by default, requires at least +# Automake-1.11. Disable by either passing --disable-silent-rules to +# configure or passing V=1 to make +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' DEPDIR="${am__leading_dot}deps" @@ -3087,7 +3175,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3127,7 +3215,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3180,7 +3268,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3220,7 +3308,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3279,7 +3367,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3323,7 +3411,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3606,7 +3694,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3657,7 +3745,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3694,7 +3782,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3772,7 +3860,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3871,7 +3959,7 @@ depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4006,7 +4094,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4036,7 +4124,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4052,11 +4140,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4095,7 +4183,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4111,11 +4199,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else @@ -4136,7 +4224,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUC variadic macros" >&5 $as_echo_n "checking for GNUC variadic macros... " >&6; } -if test "${babl_cv_prog_gnuc_variadic_macros+set}" = set; then : +if ${babl_cv_prog_gnuc_variadic_macros+:} false; then : $as_echo_n "(cached) " >&6 else # gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi @@ -4181,7 +4269,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ISO C99 variadic macros in C" >&5 $as_echo_n "checking for ISO C99 variadic macros in C... " >&6; } -if test "${babl_cv_prog_c_variadic_macros+set}" = set; then : +if ${babl_cv_prog_c_variadic_macros+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4223,37 +4311,7 @@ $as_echo "#define BABL_ISO_CXX_VARIADIC_MACROS 1" >>confdefs.h fi -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -fi - - - - - - - - - +# Check for programs ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4264,7 +4322,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4304,7 +4362,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4357,7 +4415,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4397,7 +4455,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4456,7 +4514,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4500,7 +4558,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4584,7 +4642,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4621,7 +4679,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4699,7 +4757,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4798,7 +4856,7 @@ depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4921,13 +4979,41 @@ else fi + +# Initialize libtool + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.2' +macro_revision='1.3337' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -4961,7 +5047,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -4992,474 +5078,146 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -enable_win32_dll=yes +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AS+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - OBJDUMP=$ac_ct_OBJDUMP + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else - OBJDUMP="$ac_cv_prog_OBJDUMP" + ac_cv_path_SED=$SED fi - ;; -esac - -test -z "$AS" && AS=as - - - - - -test -z "$DLLTOOL" && DLLTOOL=dlltool +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed - - - - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.2.10' -macro_revision='1.3175' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" @@ -5473,7 +5231,7 @@ Xsed="$SED -e 1s/^X//" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -5536,7 +5294,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -5603,7 +5361,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then : +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5734,7 +5492,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5774,7 +5532,7 @@ fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -5801,7 +5559,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5864,7 +5622,7 @@ else set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5908,7 +5666,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5980,7 +5738,7 @@ test -z "$NM" && NM=nm { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then : +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" @@ -6015,7 +5773,7 @@ fi # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -6078,6 +5836,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -6117,7 +5880,7 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6160,8 +5923,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -6210,9 +5973,83 @@ esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then : +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -6226,6 +6063,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -6248,7 +6090,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -6288,7 +6130,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -6344,7 +6186,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -6464,12 +6306,12 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6546,6 +6388,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6559,18 +6416,28 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6579,7 +6446,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6589,10 +6456,10 @@ IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6600,17 +6467,161 @@ fi fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6619,7 +6630,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6638,6 +6649,10 @@ else $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -6649,12 +6664,11 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + @@ -6665,13 +6679,70 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6711,7 +6782,7 @@ if test -z "$ac_cv_prog_STRIP"; then set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6770,7 +6841,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6810,7 +6881,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6872,13 +6943,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6939,7 +7010,7 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7000,8 +7071,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -7025,6 +7096,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7037,6 +7109,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -7078,6 +7151,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -7089,7 +7174,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -7115,8 +7200,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -7126,8 +7211,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -7164,6 +7249,20 @@ else $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + @@ -7180,6 +7279,41 @@ fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } @@ -7310,7 +7444,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -7351,7 +7485,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7362,7 +7496,20 @@ sparc*-*solaris*) case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7378,19 +7525,16 @@ esac need_locks="$enable_libtool_lock" - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7399,7 +7543,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7409,10 +7553,10 @@ IFS=$as_save_IFS fi fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -7420,17 +7564,17 @@ fi fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7439,7 +7583,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7449,17 +7593,17 @@ IFS=$as_save_IFS fi fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -7467,22 +7611,50 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - DSYMUTIL=$ac_ct_DSYMUTIL + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL fi else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: fi + + + + + + case $host_os in + rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then : +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7491,7 +7663,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7501,10 +7673,10 @@ IFS=$as_save_IFS fi fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -7512,13 +7684,105 @@ fi fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -7570,7 +7834,7 @@ fi set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then : +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7610,7 +7874,7 @@ if test -z "$ac_cv_prog_LIPO"; then set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7662,7 +7926,7 @@ fi set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7702,7 +7966,7 @@ if test -z "$ac_cv_prog_OTOOL"; then set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7746,19 +8010,456 @@ esac OTOOL=$ac_ct_OTOOL fi else - OTOOL="$ac_cv_prog_OTOOL" + OTOOL="$ac_cv_prog_OTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + + + +# Set options +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 + + + + + + +enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then : +if ${ac_cv_prog_AS+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7767,7 +8468,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + ac_cv_prog_AS="${ac_tool_prefix}as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7777,10 +8478,10 @@ IFS=$as_save_IFS fi fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } +AS=$ac_cv_prog_AS +if test -n "$AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +$as_echo "$AS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -7788,17 +8489,17 @@ fi fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 +if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : +if ${ac_cv_prog_ac_ct_AS+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -7807,7 +8508,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" + ac_cv_prog_ac_ct_AS="as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7817,17 +8518,17 @@ IFS=$as_save_IFS fi fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +$as_echo "$ac_ct_AS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" + if test "x$ac_ct_AS" = x; then + AS="false" else case $cross_compiling:$ac_tool_warned in yes:) @@ -7835,314 +8536,216 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - OTOOL64=$ac_ct_OTOOL64 + AS=$ac_ct_AS fi else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no + AS="$ac_cv_prog_AS" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if test "${lt_cv_ld_force_load+set}" = set; then : + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - ac_cv_header_stdc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else - ac_cv_header_stdc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest* + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_header_stdc=no -fi -rm -f conftest* + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_header_stdc=no + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext fi - +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h + ;; +esac -fi +test -z "$AS" && AS=as -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF +test -z "$DLLTOOL" && DLLTOOL=dlltool -fi -done +test -z "$OBJDUMP" && OBJDUMP=objdump + + -# Set options @@ -8185,7 +8788,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8258,6 +8876,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + @@ -8284,7 +8906,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8362,7 +8984,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8428,7 +9050,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8570,7 +9192,7 @@ if test "$GCC" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -8623,8 +9245,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8724,7 +9344,9 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8789,6 +9411,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8809,18 +9437,33 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -8908,13 +9551,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -8922,7 +9569,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; } if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -8975,13 +9622,18 @@ fi + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9024,7 +9676,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9079,7 +9731,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9173,7 +9825,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9217,6 +9868,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9325,7 +9979,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -9373,7 +10028,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -9422,8 +10077,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9438,13 +10092,13 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9462,8 +10116,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9509,8 +10163,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9615,6 +10269,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9640,7 +10295,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9653,22 +10314,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -9680,7 +10348,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9693,22 +10367,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -9753,20 +10434,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -9778,6 +10503,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9806,10 +10532,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9822,7 +10544,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9831,7 +10553,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -9839,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -9855,13 +10577,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -9879,10 +10600,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -9899,7 +10620,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 $as_echo_n "checking if $CC understands -b... " >&6; } -if test "${lt_cv_prog_compiler__b+set}" = set; then : +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -9961,23 +10682,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -9989,7 +10723,7 @@ rm -f core conftest.err conftest.$ac_objext \ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10062,7 +10796,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' @@ -10081,9 +10815,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -10271,7 +11005,7 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : +if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -10466,11 +11200,6 @@ esac - - - - - @@ -10566,7 +11295,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10575,7 +11304,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10640,7 +11369,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10659,8 +11388,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -10693,13 +11423,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -10720,7 +11508,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10728,10 +11516,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10739,7 +11523,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10757,7 +11541,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10777,17 +11561,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10848,7 +11633,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10864,7 +11649,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10901,9 +11686,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10913,7 +11698,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -10951,14 +11736,10 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10970,6 +11751,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -10989,7 +11782,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11058,7 +11851,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11083,7 +11876,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11107,7 +11900,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11138,7 +11931,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11148,7 +11941,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11337,7 +12130,7 @@ else # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11371,7 +12164,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11385,12 +12178,12 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11424,16 +12217,16 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11467,12 +12260,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11506,12 +12299,12 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11545,7 +12338,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11586,7 +12379,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11639,10 +12432,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11692,7 +12485,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; } wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11745,10 +12538,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11930,6 +12723,8 @@ CC="$lt_save_CC" + + ac_config_commands="$ac_config_commands libtool" @@ -11940,13 +12735,13 @@ CC="$lt_save_CC" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else - USE_MAINTAINER_MODE=no + USE_MAINTAINER_MODE=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 @@ -11965,7 +12760,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12362,7 +13157,7 @@ fi set dummy rsvg; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_RSVG+set}" = set; then : +if ${ac_cv_path_RSVG+:} false; then : $as_echo_n "(cached) " >&6 else case $RSVG in @@ -12412,7 +13207,7 @@ fi set dummy w3m; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_W3M+set}" = set; then : +if ${ac_cv_path_W3M+:} false; then : $as_echo_n "(cached) " >&6 else case $W3M in @@ -12833,7 +13628,7 @@ $as_echo "$altivec_flag_works" >&6; } for ac_header in altivec.h do : ac_fn_c_check_header_mongrel "$LINENO" "altivec.h" "ac_cv_header_altivec_h" "$ac_includes_default" -if test "x$ac_cv_header_altivec_h" = x""yes; then : +if test "x$ac_cv_header_altivec_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ALTIVEC_H 1 _ACEOF @@ -12909,7 +13704,7 @@ fi for ac_header in dl.h do : ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" -if test "x$ac_cv_header_dl_h" = x""yes; then : +if test "x$ac_cv_header_dl_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DL_H 1 _ACEOF @@ -12921,7 +13716,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 $as_echo_n "checking for library containing dlopen... " >&6; } -if test "${ac_cv_search_dlopen+set}" = set; then : +if ${ac_cv_search_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -12955,11 +13750,11 @@ for ac_lib in '' dl; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_dlopen+set}" = set; then : + if ${ac_cv_search_dlopen+:} false; then : break fi done -if test "${ac_cv_search_dlopen+set}" = set; then : +if ${ac_cv_search_dlopen+:} false; then : else ac_cv_search_dlopen=no @@ -12977,7 +13772,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing rint" >&5 $as_echo_n "checking for library containing rint... " >&6; } -if test "${ac_cv_search_rint+set}" = set; then : +if ${ac_cv_search_rint+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13011,11 +13806,11 @@ for ac_lib in '' m; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_rint+set}" = set; then : + if ${ac_cv_search_rint+:} false; then : break fi done -if test "${ac_cv_search_rint+set}" = set; then : +if ${ac_cv_search_rint+:} false; then : else ac_cv_search_rint=no @@ -13033,7 +13828,7 @@ fi ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = x""yes; then : +if test "x$ac_cv_func_gettimeofday" = xyes; then : $as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h else @@ -13049,7 +13844,7 @@ fi for ac_func in rint do : ac_fn_c_check_func "$LINENO" "rint" "ac_cv_func_rint" -if test "x$ac_cv_func_rint" = x""yes; then : +if test "x$ac_cv_func_rint" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_RINT 1 _ACEOF @@ -13147,10 +13942,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -13185,6 +13991,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_VALA_TRUE}" && test -z "${HAVE_VALA_FALSE}"; then + as_fn_error $? "conditional \"HAVE_VALA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${BABL_UNSTABLE_TRUE}" && test -z "${BABL_UNSTABLE_FALSE}"; then as_fn_error $? "conditional \"BABL_UNSTABLE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13234,7 +14044,7 @@ if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -13335,6 +14145,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13641,8 +14452,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by babl $as_me 0.1.4, which was -generated by GNU Autoconf 2.66. Invocation command line was +This file was extended by babl $as_me 0.1.6, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13707,8 +14518,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -babl config.status 0.1.4 -configured by $0, generated by GNU Autoconf 2.66, +babl config.status 0.1.6 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -13729,11 +14540,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -13755,6 +14571,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -13830,17 +14647,18 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -13861,12 +14679,18 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -13881,14 +14705,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -13912,7 +14739,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -13921,12 +14747,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -13971,6 +14797,7 @@ DLLTOOL \ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -13983,8 +14810,12 @@ lt_NL2SP \ reload_flag \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -13994,12 +14825,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -14013,9 +14846,7 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -14051,6 +14882,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -14132,9 +14964,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -14142,12 +14975,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -14169,7 +15003,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -14197,7 +15031,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -14245,7 +15079,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -14277,7 +15111,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -14311,7 +15145,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -14323,8 +15157,8 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -14444,7 +15278,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -14479,7 +15313,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ + *:-:* | *:-) cat >"$ac_tmp/stdin" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; @@ -14616,21 +15450,22 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -14641,20 +15476,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. @@ -14816,8 +15651,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -14849,6 +15684,10 @@ available_tags="" # ### BEGIN LIBTOOL CONFIG +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + # Whether or not to build static libraries. build_old_libs=$enable_static @@ -14861,10 +15700,6 @@ DLLTOOL=$lt_DLLTOOL # Object dumper program. OBJDUMP=$lt_OBJDUMP -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - # Whether or not to build shared libraries. build_libtool_libs=$enable_shared @@ -14880,6 +15715,9 @@ SHELL=$lt_SHELL # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -14929,16 +15767,36 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -14968,6 +15826,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -14977,6 +15841,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -15091,12 +15958,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -15146,10 +16013,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -15183,9 +16046,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -15201,6 +16061,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -15233,210 +16096,169 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac - - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff --git a/configure.ac b/configure.ac index 5b9915e..d5ed3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ AC_PREREQ(2.54) m4_define([babl_major_version], [0]) m4_define([babl_minor_version], [1]) -m4_define([babl_micro_version], [4]) +m4_define([babl_micro_version], [6]) m4_define([babl_real_version], [babl_major_version.babl_minor_version.babl_micro_version]) m4_define([babl_version], [babl_real_version]) @@ -36,14 +36,11 @@ m4_define([babl_stable], m4_if(m4_eval(stability_version_number % 2), [0], [yes], [no])) AC_INIT(babl, babl_major_version.babl_minor_version.babl_micro_version) + +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR(babl/babl.h) AC_CONFIG_MACRO_DIR([m4]) -# Enable silent build rules by default, requires at least -# Automake-1.11. Disable by either passing --disable-silent-rules to -# configure or passing V=1 to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - BABL_MAJOR_VERSION=babl_major_version BABL_MINOR_VERSION=babl_minor_version BABL_MICRO_VERSION=babl_micro_version @@ -65,7 +62,25 @@ BABL_RELEASE=babl_api_version AC_SUBST(BABL_RELEASE) # GObject Introspection -GOBJECT_INTROSPECTION_CHECK([0.6.8]) +GOBJECT_INTROSPECTION_CHECK([0.10]) + +# Vala +AC_ARG_WITH(vala, [ --without-vala build without Vala support]) + +have_vapigen="no" +if test "x$with_vala" != "xno"; then + + AC_PATH_PROG(VAPIGEN, vapigen, no) + if test "$VAPIGEN" = "no"; then + have_vapigen="no (vapigen executable not found)" + AC_MSG_RESULT([*** Check for vapigen failed.]) + else + have_vapigen="yes" + fi +fi + +have_vala=$have_vapigen +AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes") dnl The symbol BABL_UNSTABLE is defined above for substitution in dnl Makefiles and conditionally defined here as a preprocessor symbol @@ -88,26 +103,28 @@ BABL_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) AC_SUBST(BABL_LIBRARY_VERSION) AC_SUBST(BABL_CURRENT_MINUS_AGE) -PACKAGE_NAME=babl -AC_SUBST(PACKAGE_NAME) - - dnl ========================================================================== -AM_INIT_AUTOMAKE(no-define no-dist-gzip) -AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE([1.11 foreign no-define dist-bzip2 no-dist-gzip -Wno-portability]) + +# Enable silent build rules by default, requires at least +# Automake-1.11. Disable by either passing --disable-silent-rules to +# configure or passing V=1 to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) BABL_VARIADIC_MACROS -AC_DISABLE_STATIC +# Check for programs AC_PROG_CC -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL + +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT([disable-static win32-dll]) dnl Initialize maintainer mode -AM_MAINTAINER_MODE +AM_MAINTAINER_MODE([enable]) -AC_STDC_HEADERS +AC_HEADER_STDC AM_SANITY_CHECK WEBSITE_HOST=pippin.gimp.org diff --git a/docs/Makefile.in b/docs/Makefile.in index 3359fd9..c561410 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -160,6 +160,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -189,6 +190,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -197,6 +199,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -284,9 +287,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/Makefile + $(AUTOMAKE) --foreign docs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/docs/graphics/Makefile.in b/docs/graphics/Makefile.in index 9a9f8a0..7fa6eee 100644 --- a/docs/graphics/Makefile.in +++ b/docs/graphics/Makefile.in @@ -120,6 +120,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -149,6 +150,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -157,6 +159,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -240,9 +243,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/graphics/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/graphics/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/graphics/Makefile + $(AUTOMAKE) --foreign docs/graphics/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/docs/graphics/babl-16x16.png b/docs/graphics/babl-16x16.png index 37eb53a63d8d5c676f812cec59c053ab38fc9495..19ca043bcbefeb144abaede7b4fe1e4520be73af 100644 GIT binary patch delta 451 zcmV;!0X+Wr1NZ}wKYzb#Q&9kgzjxog_a!EI{Xqt?&_GhCL@QK8bg_bU(B0KREM3G! zM@Rh&T6K^j9Rw$#xay{qN^GS=I!VZrfEv=I5c7QZ{kTpFy4l6WZ~qRQ!-0Q|dk9BR z<0j*rX27=mEA=AdggoPbGmJP6@LNFTM&*3bFJ94kJ+1O;Qh#Xi8A)KZeX(_Wt4V<; zBrKwMN2x}`zV3JLzWw;7P@g_ge%*Yr%<}@?@F$>O8Gp zi!cq5oQFoQBOFwe;v$0h z2LyMA+C__#;2?ByQV`t|OhE_+Ec6l~kqAABB=vmfobPih=w=repZ$5^eR<(uBM;#S zDqN??IYOH1uhd0~40*|rvsh*TehVnyEMLs#vP*u}KdCc%Qh)fO=d|ls&%SEhYqSV> zhR;~k7Ry)b>H zHd{NBFXWjl9DhaS73&-8n8aXGgGmfg8W9m;wIwkL|d=h0*h;4jfyT9#?evUAa!5BmA zVp1=~QyxN#XfNDrhQ06@F%Yvv9(T|sxEjnTrEW+i7d(X&CuAT?e%9~HjO^%~el3e~ tZS%qAS8k!{a-1Iwc}IANAN}V~egS->p+@^FI7a{g002ovPDHLkV1lKi)Pev2 diff --git a/docs/graphics/babl-48x48.png b/docs/graphics/babl-48x48.png index d595555bf3a940c0669e1756a5778235ff19a1a2..8c4a7ee1c4e3c05a37f4fc0e477431e0ba590c29 100644 GIT binary patch delta 1861 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 Y2i379Um(f|Me07*qoM6N<$f+D<&ApigX diff --git a/docs/graphics/babl-a4poster.png b/docs/graphics/babl-a4poster.png index 3ac3455f8ccd67597c2ce3c775131c6b3a13d501..45097e4c9ab37448cf223e14561bfb4340d7c8c9 100644 GIT binary patch literal 34364 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�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 Q?%zM(ODRYe!}R_BAGcLZ6aWAK literal 34453 zcmXtf1y~i`_w`)z(wC5K>F#c?h@>JN(jkq6G#9B$tF$x-NH+-5snXpg(jeXSjqmUO z4G+)2!)4~ooPG9QYwdL+UZ_9A!=}Ur008f~5?m7iAmEP>J17QtI-?0O08bd^D$n4+ z!@sZWmcn=dpa-7A<+Z%h_gZ}2jix;|uJ+yj=4G;xAW)zm(4M~_dHyoN;d#30mui?4kx7wI*dalR!l(BBi8gmQek=nK{EQOMa@$!%@9n6=6B zN2L7kQ16&1dRH%T*2~X7E#fgMs|tL3mA93$9ud)aZc8ZbvW&O7-+Dvd_B1RNE9aFC zyp}xc2uYyz6(mr)5AOrfV9r6=w^rt8Q8{`lB%^&8d zFye8Y02M&4=Fpj&h5`6Gd3-wG)*^djAuG}>ouOV>OX`ch`s{g1TP2tM&x^a?KjT^B z4(94g92Mz@Al==ycq|JS%$*KFd{jQZ*+>I!jZD#}hV=<=rpsHGuCA;MjErji=s346 zHyY(Ckd^}MKEA&ELP81XFe>mVIpe~&r!2a1d9Eps51ZLh3IITKp>9#ab4Oc6I}+m% zV)|TJpOMjGzW(p-?zrfZmxZA)<-dQdcSW7F%eEdxMa+F-1}>KbIjwbbxRR{n%)Pyr zN+#{ft@QWA)Ca4%oG<<^3SLQ~2oEUd3*+VDRMbj@d-{jgOB{b8BmBXolpwOz*9naCPF3Z#JQ8+Tf@?U8gOk zNS&ud0zSHbU;_A>;6OWvJTNl9OLTqRJl%SqSzxLO54M!X>g-+tr045ZY@*Hrsd zQ5Wm0LgJUL337{n^UN}l#1*00xVoAa>Ky$9fvP@_X1qJ|zrQI?`P^8q)|3<0DoV@G zVEq>tED5?yImBg4v~tFmy))f&dDp+>Sdn;gs;X&x0iVTEVR9u~5UNsX6sa%KPuVY1 z_DBBjT6)vA(xaj(8byg>D9DJ$xe@tKN*w0>XSW`u81+c`5REF1uH^SO{w z=3nH`Cak6yef0Qx8Oh~J-co~sW#ov9@-o`k!W&1 zGtAT2*x}tpVv2qI8Jyt9mPj$t9&Gvx1YD|0*R6pWy9GFzHlB^;UXvGhjYUO8d1)e! z9PfPm_;oQAb$=#)nqiYrIW2|0KyXJGf49KMwz&Bqi7wb56coh3sGQi(DV~4Y#!jm8 zhEaL_ZKJ$(>RUJ95Er(%XxZPnnx|S zSpZC@L+BX~PO={Sz(AJ}m63_nEMme5MRA_5kEwT@*I8`xu&*1ph@RC;nT5Q7zR%81 zP)6m;+)R8=pQ2VcUPG2fy-}<7qJz>oPJ6Y6zFs&dm}m2IKLlv!z5mUt9vd5*Nlr~| z#72VM^YP=y-!n5aMHg)kckvmth6BBw0~E^_6}rlfk8>dmrKrlIw0*AFv1@yWQU^^x z>XB!*d81z%lMJ)KHUo4U)u^hg?`&_s@%8hgj*5y3fT6`EXhQhv9Wm=2Zwwop9<{Wz zm|I%@c^}`!zV?x5;xi`FR?6D`y>DtjPSnb0Rg~UtpuN@qMu)54pm@?wi;J`e%;no) zz40*dKhyr4o(_khb)HCl>|ZC1*n01FHXu@E_EG}~i;MUQQzABmnFW1#qzhif{e7I@ zpU3g@^^TGm!VhGM6j3g2VTdCU@HPS{%$FFl$T8FUPGHEeG#E1=yRd5r2mv@GpQ$hk=Jw zbp28Pu8b()-wF@z9Xot`>Y>kv6*a>r97PNJibKbRTSRRi$TcX7MU$@#MScQis!P|wBVJls+HIfQBpvl%+H^pv){D2& zL!eiMnD)P53kc~&pa-FvTZ1pkkh_1*0oMvyM)1aQ|E2O76H!FjK)Q1u`M+dRpvGqi zUtsd0j|2ckH~5F{&Q1l94E68%n$NX39&x4)3|~zalh%_ydGf@lWb*AmvjV(BeEE>^ ze;LP=7-l$ecwUxEW{O`3aS(dWzOKUC(tUDr0ssu%42%K_P;k=C!4d`m$mIS@f8d9Z;)hZi6c%4#3iI{*U@)0_d(To(QGMUL!TA0QfPXI+ zxoXX_*eKp@dIcvD-9$DDtRhlEZO_k5)ha(T0wSjMUp0%g{FeKU*7|xTCKB}Z^s==$ ztP~X$Pq((dYAIjs&lE2SKbN!i%yUeYjQRM0gV+tG|CX6Lo zgls`Rpp=SI<*|NA7>|H6nw06(M8M5|n=3!FC|6*LvUZLu*r1Q*6W>yt4?1YMSP~Fy zI}8uJ3`Z?g&v?t-KlX0HweOe4{U42_IpOAVeqj0T@4Mi_OrJ=TfGevCBcAzLhx+Pw z2d|CUNSf8-%J2mx!JI+(u`HpwIdbQn(ZvS+N=VutarS(eg5|IEV*s(O9w%B*Q%MDj zW-8r=YLT_}kZhoR{(bm$%f>UWcSaav>_>3N0 zb+mf9cngA3!+?RR`GMDtW*2)-7=*gCUMoS^h`bEizD7L*gHIYVS6{%hIeWfHuWf&I zK}xFQya;eQF+p;$_?_&h}i7}fu%#O}Hk&NXqw zACo|zu{B3^f&4kSvSPO?H{vO@wzjr)a*F-6UY((w?`~p3M}UVHv9z>weSdVBQl%1- z`l|K7gf(PKFf5GbnL0$zd?OF;{@l=A6q^+0vD$#7#XuIIJ7_HstSBRpmyhYLess6D zw`&Qc;*M?CW~mpJ#IB)jyBmNdbngD{X4q)w{wT$zX!4|)kO3|MRi&d3Xfim%Q7-y& zaPyd$nE0o9+>sHVV5kWsv@_h46ioz8hcOZ*7lQ#Vmuq1W^B94{^lL2Bd#|d`I+j{| z?EANGTR=N_VcjJ#T9W4)Jx(YeYjY(2>Fj)e>c3W~Dg99D(P*xpL{34$4)qo8DB9Jt&xz&?8riDWWF3E&5`O-!gtkEix#>f6hK$?-;-7O=|C*_Cd%JR}H(PMjobDzDt@S zPM=$o^ksMS2@I`VQyEQu1*-fPlDAi~g8oT_*=WAW>|$dnwQT6JS?pE@#DvzQtzs&s#MBj)6&xVEd?mVB_&l7m3u^b z^*#}W$NxNK=hZ8J&K|nk^keg+2@Jf-fQD?m ztMMeqjEu}Q3MU6_*QE*w5~IF=<{|J!&|^WgdvV;3N|1g#U?Z~znK9xbwQn>kml6~6 z+Q_53+d5s>v-+qRnf%%ZOHfeI)EX6$>irpM{Ut#W3Yqp$b9SznZFDQNw5}Su8GEH6 zZKbBFN^TLIr1|+8yC-7&wWsyaX1+km4?=?*C^-tfk_b}=fR+b9EBM}>L;YidBRgedn(MMI5^(*n&03)mZefM`Wy;UQ+6P?4x&Q?5GY-%mQGFP_Q)I%fb$(6b5A#)f+FtF@7@3;m+8qOjujvv-FiEzf% z+0M~VMDj(S4ZQX(>(I>DZpRo&WY7c&YxYtgTU#9={QQf6VAS&6;xf(W)KvC?;o;5N zDaNc}T?|ajsDC#d@Lf8|JX!j19^>ry*#CET#FtI))1C+G-dh~=FvB@6Q< zmD7*)uBH9i6Ln z5@d}x9@1@zpu$40cB2A{x4nVZiK>^q-RZ2KQs}25X}{vM1sIX{5dy%1Pbu3@rwOM| z9kU9M-7I8w?gFwucjD$uIpsUX%@O- zHX(0QV#Djhpf9jzCyiyIe9?6PJE4at!Fg4|E|N zObL;ta?MYm;IN*LMLWXfm#2c30P=S^lp8yJpQ`cTm&xx0fNdRRWzcvkB(EPAaTHH7Vg0nG!I>}s z?q3X2e8+`%%l`4<1awn9<}Y1Gjf>y(Wg6fnN%OAgtUmiGZ@puw8(S^_$d_?U`S|8( zt=%X}q5&wzZsuO9syHv5gV=#r!8ZYd%pF9BUED#Vf;+2$dSpOlL_7jOv@Q{$3o}m< zw~T6|6!Y~m;7ofsMDz1+s@w^UlRDF3WeLChhKbyLCn3^XE?*)5`P-C>N$oO+uZxL2 z9x^Q+3|x!0bd8A~XlF}~_WZHMQT9lBmr~xI z+=AFU$`yZwGAK2^^}zX+@*}SPw~3mqo8E4*YpSqOW;*;abv?@WgxpK5X1D+VZ=PeS zeC)2x@L}|kW)NwwSofPWRRx?W;W6-+nJ=i1^?cDBwohMJhyd2=m#uA2praa=j$@x? z3DJa@Lbgu)12F|J+~*{-v?}I{Z&ge~*eAh`yCGV`5?oBiv}FC#9hU*K>g!W|A$9 zmSe75QK^jvCzF0vM*KACBkqY1FdAWq7;tiyZDa@VE_=MNUGQ8^w_aW}Zf1g|k}Kp8 zxn;!wH=VCnXCm5gboNd2h+S)HLP=t3r&sy3AhnQ2#bxQ6kH~obecNF0LfYi&$sNUV z5~J+w$AT4OYhZ^Vpr!#+Cv+GqD!NJu)6)Schp4BEt}i6;7u4-RUOP)K|Aq~#K36% zwV(pul=A!HxHi8f>L)!mSJ2dFa~?6vx<=W76;&G#>(%S-jZ+S`DEIu^dh=JD5d^l$ z{}u;t+ikV)@t@~fCE8}uqq7d4t>YGc#xpNO)>ycrxGaRW=|4=`B@V0dst%GwacWnv zw8-J)#}w(5=vyzjgfD<|!B5Li^&3tOA-5pJZSQ4m$8?hxIFyv0NWnuOg#_uY_H1M& zq1h((83UFAiT|X8irZfm1Mc=)%h61q0wy2-ma~1Tg@eXhQJT&GIPxzO> z6Y^Em>u0~RE(M@I_eEQwl=b@hVbvgn)AEtn##jXYPD*Smoq-L8JA@CHV(Jf7 zeKGU$j3zm|89<8C9j0&p#QIHy>+fzX`-7zxs?6oTAiDd~UZA)eNlQ9|hDMA?J4Xja z1a1f0#^0FU{fr{L#n-eH`^3>KANai{Z7aIgYyPK&`-g@$}6aM>M0T z8S4%fdJzZ&(f{e1e`GtSx4W62ONo6j-zqQyPs`ZB=m1|8PM@nB(=WQ{KJLI8<~2$P z2(rS4^l=f#>nU-eon*PI`;QmCS`kq_#YHa*#)|<`#PL=zhF^&p1ha;ed24AOD?PrQ0H;78&a|!kXvF}TW{bbJyp+nLGE)lsjKqc zb3d|ysW%-{6_)dkYf|fxoUjyY_7aEG4&Dp{&kul$mzMyTQGinrzX)QM8F27VRHCWl zvY$DT3Qz6hwW{ega9-x}vwn(r|I^U{e`WL;-C5h!p!1Z}Fb)`RP7lOcmvEzK@{`^l zU$4F}xt4u18#FzzyPgr8)yOpUmG{j2G1v#WFCYg9w<{%JTE`X@Q<7 zis%x(l$vJg7i2PfBT#bV*^#Jo5Dcoy9RGOS4~j6yYjh8nzY;5NNygDD8LT4Ah1_cns!|YF{58ufABC zeoO+|=2O|)kE_*6@rS#)@1p6+A=Znj=;Ju_)mvTiFb8Hv%p7uZg!u*qkZj5JozS{o zYM4q}ImTAaA5PEk?Z<#1csa`DCXZch$IGc;2Baw{VM~@fo>?xqOC-81d*00amA%{_ z=JLsG_}%oEn$S@%E;xz3)ee!gc%N)JK?TBtueVKL+VD9fKjy zrv&E#l2gMXyeJWc2^{1W=@AhTYr0WvDXDgKbI62h0)!(;8x0`-W_MQ}_6Iw(bHmpA z^0R?V9U$jIKBO2Shw-YM^&{7*jSsiVOcHZO6-}Dcp_IRYvOfNMQ$*@8AXY>i20GLTb5GFd&}T z9S7Qx56_iPr~!Gn6Syv|H;8q+KK));FzT&$^u9iQLx>inW_bq#LQFX`)K3l%D=|KF z3r`J1%)*}11nsW3r6%lJ3#cb`d_r2biY|Wlcy)k0_U;@scqmTz)OxV#zkD%@!TLQ3 zL>>6lw#LMu6t91IHm)shY##yU9y+uR_4#^VJK>gbk44w~3FSHi=|m+ab!ROyeQQtY z;eHsQep2Y$MlOF7%XqB9Eli2WR`kZxWwMI~dU`*y=M4=qFi}xaPZKNro`TYlE%2*; z-wL45ZTB!1mXeB=JZP@5&#SNRFyO-~4!;jeoRFVm4Kh^eS>dQU%J z(k?4@W{IB~Wn((4wB~&CosBdq!cyQ3sLI*ZeV#DDu@zs>cY6|4oPpt2&82dFdRl3v z-|Ml+BmpMQFN;a^(6_*QdZ@K#(ZmG0BFj3c`%r^bnU$3_*r04oj@j0cCC#9#1P-LmbkechiXO_uoQ z(o#|mf;ArOz9d7*elpH6adCNiT%V>WmDxe@bW3cAxR-og3?B*YF(*tDb)Je{bFVF= z5wrn}FzIMNeuM_4c4oAr2na?MW=dREp)nZ851Nmf^IlGF2ZO2+DXhuN|7A9dex z0mjve$38+DIG@3u%ZE7G`)>@4`E^s8zn(ILyrpKXN8#VP53r6BRYMD%?Rosmd`;dRWl+d=E0x7{3Ziya&I3=W-?YtB>tV=gi_b z7$WcQ12Egs)inOLJ>37(4Os(^Swq3Aac_HP&NMiicn@bv<6z=b&y4VhF1|N?<&28Y zhn&scxcc>JkHhiD1*-X!n7Km1&QboE(NgclU&ijg4kd=)k)Ic(}P!dwQOF zgRlvF>Le?QvN{$Wk28>B5JkkD`SHvQ1HN{gfJ zG^wH4s!QfW1Y99mnYppL+I(<$m}>b#STKzq8nWAzu3m_0p;`&b6g#`S#QpvK@)8+; zmGn^wQ$ck$5PE-R@{q`x80l#&x;Q>gti+xi9v;qZWI=IL->#}k@)TH@K`|;%(G)Oa zXJ=z(`k?fsq@|_4!Ky!LT_K0>1}x754qCsPN^n6fpsv#y*?Pnz?_gkG7mdgtS^8?r-{srZpb@e=h*t%}k$&!);z(UKD^4&Hp8V2$bY= zwK%YrFW5gSx$q?CDdf=mEt7%T3uCdv%*vFRmzS4ye-ihT-jrQPm7ArdTdzkMox^hL z-A#s`Ld*4sQT4VOW&a|BSHcKs#zwZU2cgesukH>eo<9842zcA2IHQfxZa&V2?nD?M z&5yj^K}hY|dV3cv+8achZyiDO|QMML%Q^sxWlp6MBeEWBSTABn$^}N$} zZnot9SIZCg7kw)E)yjqAo`He)f3~)4J?!i_7PpU#xB2XYCR<9lClN-xxQuF?laD5g zP&L5TKqW3tkPe+KQGh>Xd)N+UsQY7Q|6Rl6w#y#gOs+&_N#*=cH2X;tpaz3HS3d;1 zaSJ!#ZOT(PWv{pLjw4tzQ}}x;VG7nYv-#kfMiK;Gc1>IUF2@rB`_j@OEHL^MHf3V> zy^{rhUk81d9!wA?jK!LC^#QL63r&xhwduw(I~bFIrx|Si_`8D1j`iK&1#wvki6)_c z-y$L+cSG-5PbLZcx1QKYOrkn*gNX5SJ(vA@-Sq46e>4{d2PYF|zF{|CGD0CXw~yJO zik9>I1L6A!_zYVJ@b@dmcTN;O7?)v-|H%fuyUX%v=-ZX{AWDQQur_)R{3RU~t#MwK zp=&3!4mdMhzD{b^N#2`75v(#D-PQX?zNNi<0Pi zahy3zvI6Q=m%OZ>p7Rk-4LyvK9M`bC*nE!wYhBJ(>eM5DvLPLF^Q9ENZfCEX-mcH| zxh)F1N*e9;T}kw?S8TUBqk^4Lmi#Yu@g!I_sQI3lmNj6$AZvvv9X^^M{JJmH^i|RD zYZ{#3#WxfHL-idi#KN4i^sx^Bi}CDG-Q~7-CINN&&e*mE#@nzhD``f)?&d01)Shl5 zYK+kw`duWgoQ1(if|E5$37`q4YEG2(Db~(FQ4YbreMFvq&W!akzi)intGWJlC!y~@ zf?chdYVvRu8lksIu1_Qj1dK9aJK`S{_u$aw53Gv z_3Qc;yGrI4bLalAUMOSblR)S}gi=^gAhHsDMLHU#vr5eW(G;U6zuiOcMT@^c)YgI! zISTmz^d!DW&#$KnXulIpy z%)@wRe_t3l9T|CnBA3=6Ijw=_RE++$0&uy!tJGu@0f0_+px=dJq;n_0=Mi_tKXsVT z?;bN4zKI^qo*$N|i3KoQ%P7NN?O#iqi;!9;P1stzUf!>wqT+Ru zw%p9HhOG+>F<%eS;^DieLI5i4T!m~<=^+f5;0js4G8VH|_sZPN6nE<#qkPo&yd~SC zhmw-gJYS1cw}|Z_NglktZBEb3oa!aFny&}DR%LZA#toy1RDkZv@B&I4#ArXm!c-J-V;GnJel*2}&b#^QUH!C4bEiO96SAEV5qm zF@t#if=|Pn^R#!9j}fG+;mfuhcz+#uvip-jDayolbV0eOl^Plb5Iayi zl$GCb^$Vn`T3><6OxoPnAH1rlVJZPReKs$7F$7G_+Q0nPM!=k)Sv#S`wlX>tD~Aro z@nQ$le*Zj8vbTp_)p}ekAVvTIj)$eCr8x+R@^w7PoCrwuuk+y{{3cg52pKr+c32ov~HiJC4^z_ygCL1%w@TF#JN1T)}!Gq?6E;G(PFSN|a_zuhKE23|{v#47}= zehq0mJ=s zMPcXtej+!gpoLngcuKAP&D(M010W1W?}7#AVVgqvUd>>~S(WKff!KAsal28qjC3zGGgAekbb5M<+j{vs%CX33 zuN(^Odf!Ywc|@fW6j35z?#Mad&~kg+KXiI3L}AfBU{b}^ufh`luRm5%F$@{08WPfd zeAXrVt!hYPLX4?4z;?#2f&Kz4_%caJNv8TbrqNenj`P3j9cgK4MMM`|f^pj07A*F7 zP)D|Mn>c*3i!kK)AYn7^MQg2E<36IA#2|f0a zp&bB4d7n3jXgXXR!av0hL3%kjI20T4SeTo?&kVSJb8~sLCM7D$O5LX)?FKk9;2w4H zkgjrzQoa|`ZV({+IAmQ@n5wU)p|RE-L0nr|*=}GDvK}d_j1~9U?P_Q{>;F&-jda0nahP7|+J4m>lVu`^ zX3F_a+)OSz$==!wr9a;|xta?mkoo35Sc+1KfL&Ow5OP)W`WWz_{1({u2l& zECw`TXye=NKIdmLe4v^!0iFJ7F^3l{x9fmr$AN3^WIPv{WJ#9CD|I^Z#F55amjc0O zRD1!^bHt1lj_9!We}qV-89u3h&W_Vs(dV$e(DmivmuoucQ}Rf;QY{=xi_`C)&BdhT z9-v2i$?A*ZnG8WhpKFL>fo_uC+H5zQqIZN5g;@axX!7*6Q&9>t50ll4%4UBL5noBRy|ICBN>_ zAiC;abtnp92ba5wIL>MPJvfj>Z3mrcB83`R8&_A}p2qJ&Q$c~zLnSj+eAjzPt+nET zTd*xS^;xR8da039N(58^&b)6n@0&Zh){zG{T_6!s;43p0b$sM^*O_55N-4++*@Jui zz2j%J>(^9fz1(^x+XOW|0#&7Y0y>#JhsCBzNtcy&DyMjBYqItqpr5CWThQ0PLZRhO zpEp%?3K*#MUzvs}g#30oJAdiezk^DXF%G^>^W!r`Y-%3D9nt!f0adVRVQ5s^ zJX^nRE|YZzP&@ZkO8$K6@V2`3FqHQN3=Nb5Y$DiPsGlwR?3V2&eO8p*!SG)m7OZhK zeiw_};O$?j2$=G^2|Lu49R^Z<$I5|DX5uqt6azQ`ehGkO>c52X%5N3N1P~m?W|&Cg zHiS!Uq61nWeS7#5ukjgdLg|Mp58d=lzh;%a`uVfMf8QR5latf$ zaHXTf`aV$H3oJR2K&11b&;giHdIX21)_A$N*rq*7EG#Sn8jVB_e5SvfAGHxW94sh$3TRpKrmwx>)q1v+M5duTr9Rh`iobkb7>Qm8L`#^P$||{y9ivP08*DL z!5LH|kI)FItqVM!5+Drg(cXpq6#&deH7amYzF`^>2NxHedGN&$b`PfMi zXS>mDf(#+%e7Pj97HT3FGAged0}=oaThf52t+Z=n_YoBLoP;StX*dZDpHRvl?^2X* zBPMjq4;`!>Vkn^pD&SN1>-+(8^yhvQL?+>(0ekKIe3@vgu6(V*#A2h{46pe^HVu)W zX(~w}drCVJ8#ZQnB5jpF{yzgB9rgreFRlBvgj+E zfPmWaEJklIy%bVFr;^45bxq~RN}AWvv1nOybrEYF$k@85UdEve$%vXh2InjrBCkdU z=NljM6MvD2t)9Up5N*vmS;2iwE;sKx^Yo@c5co9uL>u7LRYs>4l+4#GVg(J1KoYOl z0_&l)L!UhG@JMfZ-UgsXTc!WSW-i%^(raQ$z3dTs2PzXz4j)Dz&Gg{UY)*=&yd0qkCR=aqHZxS}lgdfxg1S$(^KnkPU2B*dg0zZor9 z7IUq_^=;i;Wos3*{exyPt4|9ebrVn}9M$%GohM$nWq5(vEe-%`HYgJp&vBs8+_A`` z&8TK6L%6GTj!v1@U43L=KtOBX#a$UxIvwXn)|A1m7%&Y=cLz6yDUF307T-uxX3zWs zy_}qe%1SRqhlY9oM6iJn8G~mBU1OyUaY#252+ZJg9&~jQMz0Fa#L&DX=-N%tluXd{ zE@M}Lqb6A~Cu%;ChwYhfv_?^yBzJ1bPK2SGBF)gk(}Hu;fhhGzx~)zqz{r7SmyW++ zNkYkr-cSMiN_!42?8C9KPgc=Y)T}4D{BsuPRvd}BOG~f8+m8(x?Tl?BPC)O|6MMDZ z6wvy|@lolptYJx+tR-So>>ils$6g6+Mr0`m9m*1JkzL$%w+3Fnlf5~(zqX*eo}mCp zL*A?MI=9`Q^xMoQNROYfPSOFz2!jX8hH*Os6t zudDUsjJ#)YpQh#j1njpk0~#?Qm@Ytk-?*M+$ke$z?SUDq4%&0+?hnI%gA(3ru&Klp z|I+|eln=yWy><K1)=>Fn5j*cTQ<)WeR~UTKuC6c&Zx>zD*@bw?WV5zp%i9$n0NPC%o%XS2W>A`4 zb3Tc?ZQ!<@j;Vm$^;~)w=S#wS}UwS~FCCRl^j-V*h!LXznbrsXqL1l%#%ipULb8sOj3G%Ff%2YGcql zU}$MXmOj2#v>a(2l!JH2$y{&c9^5oGHj0BsM1DRqCrC-I{FZPD2wpLMgiYF=b=K@q z{rImE3c-!5+vk9^Z)0nc4KZfQK9WX)9T0?}f91sBYj*nkJP-Is) zv_tt7W$wG2@3!7$-3+BU&A4`v;V*d{Qh}|l{&j)4*jP&U`OV{8!W=@|qw`&+hu;AJ z;i!BBHz*X!)aEK6W@>fcfpttW`Tm&q;kX<0IwgUctFFCqyr$i>hjw6K;8l{LlXwf* z&nh3*dl=)r)5L0Dr`vRuily-)Z!es>3$P!gqOizLQ0OUv3D%4$&-}uGHnL^~9_wcM zTouu^oNP$SdYC>0n2*wraCKG04dKjw@Gl>0L+j4OT|>*G~e) znB!kiB}1qKKocSnZ|kKwB>?)FI6;h9T7T100gYXgHIrPzTA|^Nt2nx+mwSWGfQ}-I zc!`nZSjB`zg!Tj@ax(4yysGW4Gbb6}e`mbyb~}(9GzS}~vzO~WfeVTCd+qitV>R7&7;bu+JxV=%oRY=ZItcml0 zFN^&N8~K?jXRM8hu;oR-vPa9Li$oWN<{pynBt=>tGDY{7zuU7tY*2|_6uzp5H&azg zrnJ8V9;%KWJep;pU%eh_6+c3aHJ9SUr5Y=Z=vcLL)}j<_6uPQ`9tz)58662jsLS=E z*apaQ4!df2$X6rD@@lfy%Oio1uXG7=3GQ4r#{*xC*axq}P3kogIWmp(#+34neDg`3 ztr~Y>-7?g#$pFpDKn3pyqkO5HGER-&Pg($lYAnU_qGEr@x;j-J zk2^*DvGnYW=a2}ePBRl%hgSZq&3&BBlC7-L<8Eit`?+=5*tGXyTZ%+{AcHHrq?MB~ zeM<9Qm0Yn$9O3k*LH_ap07GM!GNdLC-EP6zN|LEH^1G|(Jyx;M<{ztpG$xJ;e%*JFYz7`Ubm!G-~Mqy*94sDhZm;|9BVxB-)F zC&l??n;QO$av>*oVGVJw({w7ZL`@?83l~aXVhVVXIz5?jl(Ql6quFJlc8Z@1ILKo0Gx%s?m=&M3g+CO45 z6oCno~hm;DT;cBY9WUgMi{@@Au$N)nY@fXyD!AX2Bt(O&S$=`1be*a`?3yp?E@d?=8 z5;s$FLlM;K5%L5PK?VXXU2->J!B*2J8=o>|7hmyP>7t4)yE)A%fa)Ibk_aYuLTF~M z{9ZH{#g7W%Uu#+U@L8Z zG@2$9)oSL<=&bP-Gkw*cMW!Dnl*E~Lqp3u00YJz_N)#chziAOQPG-UIC5@Sux{z7^ zESw~oHj()9;vR>C9+Ok;6!A^(*Fi{40Hx2B6c}iIeGm=8hlDY5|fwwjwli`U^~ zRqv?|AHihMR>oQ$W`|vYTUOv5YCFxt1&wof2XF9^GxL`xwVxeeFXzKOD^w9do@-!Xn2H19T zf~LR0?(2VA>#md0E(hvJHI+-E;#30F_u}92K_W!f>JX)h($W_!@$AH-yZaM2&VbAW z#(~MhLx$vi15KNtn1mN^kW(lUt-quJKEZLTvwiUtfpnNI+iih5hvJMU~L3_zz zqdO!D^dx>H=q?l2dH2#&xblpCQcXOcn7;67+8;q6M?r&hOSkW>?+zzS)b5P^EkU2I zKJajIdwYut7g|X9%-40&+{L_6L8R0#-;h|-XVPKdTl16*wNZg zMh-V#%CwV@!}w3^W=yh_$<1bN4^n3#CPXrD(A&B9f!a3(V3P6b^&-b z`TA04bFV}L_KPa~pWilnEnVC_+$G9-uZtlb$l8~B58!Bw5WcSV86aTcq!|@#A_hwE z^B)nEr}=B`nvQzpC-$$a1_rkE3{3gFlzT^kaKU;3f7iu1&Ez*BOX-TAz0X(kbB17`m?p8hA+UZTiJ^Y4N=}tUmI(M>8!2NfW)Z}BHV z6JkUu&#EIG*C8b(6;NikcXCoklQ*61ybCH6ninzLcBky>>T0g6{Lt+~^ARl*-6i|z zLFMosbsocZ_r7c_$@BD3;&t0k`iXcS?o}C43c$cE%P>Y^EkIi1MI7+C`VOF6YWDVd zK_(T<@I}tKp6qTrK&&$;fk^h^v23`1+C`53z-n0t{rfR&WNs|#4Z(_|?=pspUPSLV zWOiNe$#5G&^9=djaPMhwyX-?ys)^Tcu%W1tuUQ9j@zIr)Y)UFB z!v-?=I|^WoiN4!l6m``~{AQeJoCk@-r;%U+JL5uv_WjjKUlRCw(G;M<5)zSjHy0HT zm<;K5NB4s-ue^N%8PMyOnzV5pC}3xe{zBzvcyjTg&gzF5XM*!_V>{VBO035x#_NN z+8%Dmz-?6_{E7qw1X(qRVsIIrhG)A)%1Dr=iG`EVsU7OL%J@3?I8{oFqlJ?a9dVr~* zu;67GXdE$mzlOcwy_r$DKPjc#lJiTq?OK~!#*aL9&D<(Kr16S^PY`_fhns=-o0pe; zviR)Gpl2x!l;>%sWn}|*rVO1kmcY0aH=OoJgqV`cXHW6T5=o;GB29rY-EDrNMKr>q ze;B(E+{sYCNFHyjr$^uCx*~=TdC_R(6owq~5QuNmJ2>+_^TP0=KA_F2Sbo$%_VXv7vp0&bEHx`0xqJzxhtkKuCyVJ>YrbmrS90OhJ3djy zDigl{dvK2*jxQa$IDG&{Drk4}+Q3}ynr^%IxCK3MEIvLulEZ?60he8LD1hH`SHzLz zXq(>u_X14ay&RT0!L6M#wN_%^&$>#@8Vyxg#kwCiXv;0{7@M7^M3Hc*>A^BHni!yT}sTMSm zRF0fXnmn4heG&Ryzd&RBm`*UWDz0jNfBbc{}$8_n!m^LPXI&|8SihmtQ+cp`^~`C zFCVkJO}Xs7-_~*An33yTR5^Yx^1+tu1X5C2SXt+Fr{Sa7GBnuy1;E^q_(sLwIy6~%uNzuh-oOx|&fg1cWF z7T%DX7*^N;&1{pLXeM>5oCg;3W`N62oo9N#{Pr}?EId6)%Xd3HjM=n*rv;vf2BLyX zmu|T2P#VfWh!#aU30iGj*Lv|zFD}41VP^(+%|V(k&DCI*kN)kX^4JroNpbvUK~vwt zIP&L@rATD%cknpSR$k0YXd1q_%NyWgKt|J>0Vp-Fb;g|aOMt@zAGJ;)Xd2U6J>1Nz zP;-YCaAt2?(#JoY?IvEe9Up7E^*;F7A}~3sw_ky_-2G7IbxqFSm;W}=t3Tvd0ld98 z<>}_@o;7FkIa_jz>=>TAs`6IRUadGm7Edlg1>(+jIZnL!nUt)oXH|OOZe3)qrg-h> z=;)4L9$PWPJ$AYAcZ~m6)>%hI*+p%C=$3Ag5RitUr9rx+LAtw??nYXXAw~oQ>F#c% zLApgsI;ETMJm0(Czg`x)mP=*LJ#*jZ>~rnw`t350Ehu4?ELcGwqo@p85K;%G4bzUOQoW1U-Dj@v5DTpgp&KM@8R-XiVH&(SvH zy2lptawshi-N_P&{z5L66lvAUp=3k-JIzL@#3Y8Fi`IU%~^CxWKdBw5Q+icSi1B@Y}sYT$6++3i)q zskv2-%M6kp?os1Lf+Ja^PL&?aEb6j09h!Kl0gqFXLT{?997iyDC)&tesJDpqpB#Dazk&(ks@#?(mzf@GIKC%^smXwHvX_YfT@M z*Cr9rN;Bl=5=pW)Ca)reBGq>NwNl0#w=?}*cPI0#I5#>wA(0ju0|%1o_@D@RVd_Xq`Rq;Qx^_yn#kOGQSXv? zF6IlG%@VE?*gRJZ*ZViwKXX@n{D&>_N~b?M-iRkqc~W4K&fXug*`&oAJoIhhgn)MDg_2L-JyiAwOb z*I4Tf_Md?JWj^aS5#B-TuL2R@iu^ zMjp&SK_IGF1)(X-D9f&7g+ifbzp}(RK@>KJ20ad@@h*jUp`Pl6pldJ?c1AP2{xm_? z#iQ>+(vVz^O*XzPRTeGY&K#>-vskOI&y}KU9o)vG zOvqozmEl4p%6jmW_=1P-3OGgL_j%@^<6>%WMii6j9#u1hBD~u6jZQ>xK_v*j>z(Ef z9OAlkvmRLf)IT{5G`~Zq1&v+>B%0NcUY_fF!mR$-RFiwuOvBzc`X8MvAV9wpfAlWb zWAltlNSOTlm%f`T7nmgvmRoe0@@&nr)%LLZr7xt%;;O$6(5Dg1B?|1$w|Kc6fu7J_ z*0*m&0?xl_#?DIH+r@&sz0)uwLJy9Q$6T)I?J4U9~Q;rmCGu)HoISv;@X-W4Rhbs|ga>yS_4_p{XN+kw~H zB%dm-F^7s-PLz9%l(6;6MhU{WB8xBMYJ!#NVSyy+?yB&|*TvG!>M&Y(U0I_PQ zn7tIg{}Z*z^~1{3L*n4z;LCa^R%=G)JkVBuF63_OZ)$34fxYU~NQH>2D=zTmG4GJL zK3L0U!%EzAf~atQVa9cdJ6qQuLcFVDSdC2yjT-v*-YI(sl19oG7Zd&pCKY5M7FOKD z*+;~pFDat)y$@II&vwyVX1D7$SKvVibxE{H+!F?EiX&3+oSaF&&5I{xkJqO+v17V$ zG_~Pxkl*#QOZ8>g-yKbiA171Wd4q1xca2-Z@Ba%y4ubCBO+bH;RB+V#F>VGfNN*5|`y~Q054||Js@DrKyGDl*Tm6AiI-f3%zrVa3H%=FhkPJfPWMB1F+7#)oQ1fLMTHMDh&0ep zv>|M%bbELuXVCWW2_o*(ZC4Nut@H)wi{)2&rHhvm3UyD(;&;SvKSg_napiiFq7@- zP_*Bl;j9u02{zt_A!L?kVuUX}VJg97v>Y~wT4V3V(AUj6iS0}p-nO-w)F9%;GL`xl z#P`MO8vp$7*PlOaf<7nokuNi;w;jok9Cz{ z-on0kt79~ujX#~EAw=vVQd&t|v>ESX;Me`^WKtNSP#E(NgVgLiR1}_H{OW2<6+cod zwL#VP6aR%BEJG}Aog@G(3WNcCpPBNh*d`z&Ea5A9v}&#=xWmiko1eK*JM&T!8PvY* zcsVMzJO>Aih5GvXa(5vogcAg17s1_ab$P>1>JV3SiL=Qp`zy1aG%7fs=$+qCgz0|f zfy}nfh17|_+g0+7P?Wa}m@7nih;?f}=7TO6V-q+wp8G-8I;FrHVZ$wqw zVCAYC$(Fj-_UL#NnCs~Oa%j@KVo_(Er}UW(wUbR^`tym*%#GYn$~c{6WiB^<^w7XL z58~kH$h_)w>R2^JcQsZIH@gpP2&Q_>9uf}j((OmDVk>yuoC5YqrmC7jLW`#fhfJZL4n*S2vD>rixmUySSu^;_L` ztW$)sxDnSYHLrymgU52ZhmFE3!s!4~laCd6|Gv;<#Z33FdubQpP9sBl`^(-V@}J^D zaFE>BHQL4Annu@D4X!M#KIr~q7in?do=IdvRZF~nZ-=XeE_m zA#i}ncl5*OtAGyb&Y8M6LgcPBEtVM*`weMayU~>tjSqOpB&nz8bFjP45rEve8cJp* zip+Mxx@+Fd7hN&=uFUub#1keUlaSdyi0W!TX$$V#V<9o#8xIP|_$@lJ3p6-j|W1D^?yee66vXTNZtF}m@l zDgw_>LBF+i!8>6;PtW?cvNHC~yLRk1=ZhLIrb~^#Od8YB0Y;VwqFzZe$FEFL2a`ru z$yB%;WHr+29Wab7FD%#vo}dM}I?a4nT{XiC#6_&mhE*gT%*+wz25oAy#_w;Jr-!|I zmQvEe&iO#;Y!LCi_*XM`VqYo_0xUOBS*frO;U`k)9&cC-Z-xAgVxwy>b*E`%0yHXF zUs&Zwak?p^#B8^751oCtye%lE-7Y;)nI1k zizLOo-+XW5dM>T~Xad zhEh3(O?I3vcTXdJYJ*xwCg99)=gT6iAHQO9sd!7Le{>x~Sgts2tsdH+5&Unn?Q3#K z<1y_Pgbk;okd{{@$R~?|I6CEMdZgZ@PkjAtDtR_DeJn!oPzj_?8W%O3ej!DnK(qW% z?EcNGx4?Fss8KvHlB)Kh-N_*_xTuKvn|RO*;6TiVGCD1JPS4Jg+_t*}oP<#uwwpUs zaTqqPW(s>H#6$I&^Vo-*j|3BD_4gAJp1G|ATwxf?Wd;TXJ-HLfECc?Bxw*L%kP?BD zaT3IfB4+ie1YK$7rX{@AwSxc zY}q3A6G}`@V}(zP-J+IuhD)|sf7LMK*lZq)Ikeja21NY$D%DK}QM3<)@2CgzMoBoq zwHB*#S&;{q5?)-JaZ)o2%h>#2qIlNxxoUQ(j#Aph!~}}{#<0~JAHYDS|NLV;$fvl&YRkmcc8kwx;k53rJ)uN^jG%>*nF$Krla{dm+tp#kd`>c_qEnR+oMT|jnNFK`K z^$+CW!Fu-ec#_3nJo1~{{nWANqMzF&EiJvg1Z-*+rt2K$Chx9}O_Htx-e@vRf?E6f zdcUIM&!%94=ktCL`EUi^T8EhaqrJT$zsxydC^TeZLY*j91{ld_K=Sk3pk=PplEc+> z>Oa8Ks(`HWSqE;6z@EAH0h0D9;mnd2s}LRQfeKQau;kBEK36(wuZf^ zoP_tAot>W^A9@L2sj{^`Jsfw`hdt}U*{I2SaC}O4Xkj88oga;oA~|INf&W-?~;zjp7c*sh=z6 z78<2F!YlpW zHyyRyR9u5s*FS4Zp1iT%&qEaURKXMzh`;i)uY`YwRvr8M)%>e=sm*$g z10h6t9?FteH78FmUaXUXI2Gx$7b1dBFU3z^>H-)*m9use3Z%h|j0E(E>xtcNSeKCL z&<#=6=+L)mPcZ3?5!QbDN@?i!ls#R{ZV*jur`?Ehb*g!y`&IjKjf+J|sdf4XK1(g& zv=95oFUY zY=Y22t%Y8^v@V($Izk27T0GYb<++)jk1ZTjuRqWW0Bf!X0JRvg-VlatG?F5ILLw`! z+22MmL~z9jSE4b5Y!C!v&Br=i4_y-51Z-^o@y6-wXndG+338Fk-{7IzO}IlrKH3Sw zDjzYF`eP#DV!+ut{)U!`t@!DpqSL&8<=V^kWQYkWtQol3i>1kMvMFsVb34U-tlm)O z*|CjrUedLK@?N+Y3K4@%6p4@g`g+bN(2S z712qLt}EGyxJvQduopg>`ZqlUoDJ8W?tcb7p3Ha8ckpq!OzC5Bo_@wXOT*gYGDtHr zN1T>FoxfvXlz52)F{I=}pO(c$RATTk9QtwDQmkWY-)_N`$=m18?@xDMa@d>_JqaOW zgV0Gz@4_}P5q9s)@OBlkt*XgpRYC;*u>|+0z23hI#D(C?sB@%`ZWU&ty+Q`Q>!gRd zyR5y9cDI-Ie|LxtZ#qli0bWs+sc;8F-zCmULm zk!_OJ)(Ig`@}wKnBONZcERDT1SW%1VxN}~ajp$fQ_sCqs48{U|F3b(Ul&;o$V;g}I zYw72AM|vdYe&zC;toi+c_VEn0=}8arB2srwafka&^%k_43x^<{L z-*bt>ONJ1!PPz#PrC9Tl#UoD%|~E zeL(|o2sl-rySWV1i6k9Bn35iu?MHT_?=XJ~R_6#a#0c{9;J`7vpx{+v@sVdRe0N6I z#EFucnpA3jqp#BSxg=Pl8*rZsenzZxsv;g;&;IyA|9YLY!+YYa^+Dgk*}(zJSJ>~B z`0eGVcGtb>B5{P^o(})(aEy^V+7r%!@i6RP91dr59cUyNe_$Q4(D0$hf0o~S&Gy)J zA#7>)mlD^@?M&yse?20SUw(}AvkG#tNw<1eKf8q#xf^K_eJrg$T?AW1TD@)N&`A2P zfc|HqMkK?f55>1L8p_W9;-gkf;>iCUVdU2@PZ@Rh^x1WOy1ilRnz59gXt^&;hxHWF zKZEZ3gGR>0?i}4W`r^l{*|48I^TicC$9wi%u=1aCmqGYj|8>IGkcyu@x#DN=F|Ce{ z^DK_GD2=4Jr%;m!!AjRvLF^Z%gRc~(GO)$4yNzKayrdZc7kE}4?F1R2LfdA)o6xzj zU%VWbd9$Sr^|>}~8W)cHE{Yt>K#T0O3zKi+u%ns;``tn9lIV{*me1H$U=PHiHMCZ( z;A`_|mnTCq<<<|2kRXyl4i2vbdT|PdiH!o6bw1c3E(KQnH6yb#YuHMd82*B`%5OkX z<*oeSIy4&dHt;lQ?mvVd*fY8NKtmob7 zV3_q_fHPu7w>LMAWO|N8(l+8)vvql@Ifv3Mf}Dm;O!hn!ie(y#ty29LgUm2PX|ydy zT)K`%c`oB)N4LbvhpB4EK}j<657vUyOZ6&1=IR6;upAKSMl&dkV2DA0 zRU<@q%cG^>DVt{3MJqFpRo5cYNL0=hAi$QAqK^ZwTC%r&Lh$I63#K9(fYWXL66|Ce z2CRcja+nDzPY_7Q<38mt9tDwKPrq&;oeQTcm)Yh6)sjRJAPda}9&b%4bcS$KYk*^g zu@GUd*DuZfKCn@dCqaV9!?Xh|8gm1yX-PKE2^d+}drMc)fP9`<1?1>o6y)TCWEKbi zr7%Ip>GuBK%Z%@qxJg@uQ~rX8oD2-ji(m6W@npx^)%71iv2v4%Xc zH1POKEzHL#-C?dFF};2=M_mwd1@Ut9P8kR(>*a>aGl@MqmlY&19L-$;c^nH2*>NP;E zIhavSAbX4w`%~HZab&1|1YC)#+1Rmj^t|%+#IDN<$T-7#0w1;vnV;q}XI@{l=os z5m7U;Bai0=KU(da!B=fbiGyb^k{2t1r8oGwuCI4%rzuKn%cRaXi6P%7iK`>h5x~;N z8I$uv3SF1kDplahnj7xkM1MQlg-jrQ{+`}RUrQ51FBtg#Bk^0KRXa&MNk+Z_D@Ifl zJ%qASwW|IIL>{Z1mY(&v9{*Q23X6{6NSdOslrXgjzxtSzhoI#r+?)Ggeqz=8+?D}p znI7c*jq070Ah~?6rMKjX;A{%5kso#wLCvd5&qbY0K3@;(t0W2y$IF>~`V5bbhssjc zY$X2w-9{--RM%k=M){FjU5X;Cwi1D>hCSRB;RFEYMmDVr)zGbfr~#DWH>QuFZUzPh zG4LdYLLCI2sqXG>30*nAk5&pwip)w1N1@@LrO?0RaeJk(M|r|f2|dl~m`D+$75rdG zA%*uodE9L52Xp|bJeIr3Wpi^gU{!-aC+7UUueSk$bv}rD z?=&BM$NLh6j1as(Urr=-E4f42$>mn`n=1D?#m>-(lMB}eVo-Z4BeQTKanRoG730;d zL!2?k^ORD#goR^i(8(aR?NHi0%i(Il3{}dpvuhA=q`;Wc(v|#Z^)92{DRqAl0hvGp zGo5CjnvGS11zC+gXpqn?}gP*@I-@&9`!w>fDJLQ3Na8o2#Vz4_4Ko12?VrkH0+%uDdHC4^imG)`Id zX>~Rd&0Y6qxW8Wv@m-_gSs0Bea~??Ze1*>( z9I!PsG{gd(YWYhM95L9CqhC`~Qz|vUA3KdEPKu7ssaCe>Tn~<4IV-EgY-CNcw7l-D z3BLeqvH1qB6U zk=f?~Ccqv2)n9C^kIdp-3ZN4fx3w7wC%gpRgRZWwLZ-6=Id2J=FuAP zmY7S2AjNx6bZh<5nPg>xtLaG6xsN-a9&HgM6qy--ZvjN*-xX=av@|yZ0xf|gUKCSI z%o02CTr60u+kG#JTR&{ZpodC0SSZc}+Ch8jF26d~ z48(3M`R0sC6X3|!0*qJSPDsznI?e*u1U>{cMYzVzd(8(GM{EhLGNfma$at$$C8a;^ag2^}w2E@TNU*29f(6P5|t zGVS1WL_j+@?RdPXFv-ZwY-h+&WwpKx$LsSjn)&mm{Ovcv_W=UL_Ov-CE>D*(v66W1 zGV1h-_~HyUo-_aERtK#tq{$+UL2*{^07+k00elTT5c0+W#BZqV$mnRazt~$v=IlB~ zh@0G}7e;NT&ddar(i_31T<>2~RQ@C%$3$r#{I3Z;7PyK;E$DTB{cj)q!wgZt={V>L zL+d~8czT?p_T9;j$jDsLe-9qPU3a0;_G3=5g1mtgD>pqdB2Ohmz55Qi zd~|zl_JK5lQ%6Z|#9^m1iXgT8^{k#EUUK8s%?SR2+x zU6P__BT6IPN6=!=N44tGSM78{;#q=JLmVL}bc@8$8wIK4@er9eG_)lPU_~ob^qVGz zl%=6y2VbbB45+(GIio(QP05e)yZJDf#JNkxezSVDs}=*B;UuXOX9 zySwuysTN#aw;%6~3(-+Et<;Yq^LQ=RFC%>)yiXwcB7aQ`6ed_q01Wfhv=!2!EKKta z+T!Bk?GGk&e}7L3|lu(T?QLss$OqA`r2)y`6`*9s~OoWtAwOr_p#ZYq0G7 zww)v;Bsl3Dr391+~=I(9WEhn&R==8PA@$0{TmdoJV~nH$k^VQZK~w z^+f;s-ARVPwFpwM^HAECy`c?vSn`yYmINV@UzXhK3BpJ6?wNi~pVk>5srvj+j5Hy0 zobRw#8Ku0uu1W!10pN0T(o;j2uJX z|1AlUUgC)t{INqOEj@kMxW$v*fC(9<*d)`Rctqv(dm?0cTrlj0hwUeqPV5QqsXC;f z!Af;08W}$j1>F2N6Lj~2Kzkke&xypt$G3^EK0Y&}?SDQY=M^EVwQ{g_hggF5psL%b zO!F4e)9HGJe-&JPlYw*7CMJHoeOW(P{riquj@zR%GIgtxASu8=OLL z@(^O=nl;SI>6gPqp{AJE!*%YslnLQ#H#F(U9WDm%m(dAVZ6(IM%oQ9y1)MkdQtr^$ zHjM$fw39}SA!uJM^h}2Cbfflv+iMA)-{5{ zya{O040*hpjEo-y7?l~45lRh-EOm|6Nj!z4qOw46TFmc~4Lrv^T-e0;lIZxB+;CG{ zTXZ8MBmaIXuY=}SJnyhOgHy|HJFsT@NM;e}AfCNz^|%s2Ahuk-Z*25yqMnMYPx+(S zyeL2p18WE9YqWH9tWdsqkq^>aK)W;|Z%PA_;U|)bpeGs~L7t2cGI+>n;A4E2t8sXR zv_}s4IYJs`EBDp5b%W~o1kfoT7PFpivW~5`3ia6X0hta=Sb0ct3A$VA2f@?UOT$l8 z`xvcJf1$zu{YcXY`zDjy$<&`fxu4YU050xsAP2+2XD(xoCbXlY#_{lVYS6)G0N(J={dPd(58>d{apb&d@B!6+U2KExZ z5b1}^9Qfiby@kwI zz=TY(fo-a$FOA$fFexg(!SVwJy+1H>A7J%VsyK+Isusxc*ZtM+&OElfStj&+?dVLfl8TCip8!v1q`< zXklf=1!(ey5X!N4CLBX<8HIRT)~_*btgX4HrluyZlI8OzIiVjFiTAzToBH$xPt!m@wx2qsq(?24L%Q<2DwU#+N7# zbXtz3dQi<&fuuAa7nfSw6M$B<-v7C3C&i%c=E4qh7oy73V6JFsNf!rL#sd)i5KVi% zdG{C$(0vTuz=wwgfV7Y_x*QKL13Efi;9}Xx%NxS}wTi8clKY25wx zhcM0`^vU+>0!pY4j8GF>`*HRidjIoriCd$q6`t|ArHo(J++bzu*p?)F+2OGjaZD0p zd{TaQe0?N*Ec%Zdf3%EOwTGpN*ipJz!E{9}%gwZ~MVEVWfxl(h!%37AckJVoa)|8AqFJd4?;g+s*7+VQc<{uL*Y;ST&y3!6 zx!>bv0|GW@OHWScJv*KLhoDc?%X63GZC<$No|cnF8B|4gN6i;y8&fp`zf4{{@sZ$^2potv|cLv@o@Bbf38&!{W>FP zms6L$XVzz>;}$h|NoVO3vN-?Mh>1v3=4%(C!5N5-sS5Jrf;NU_gy6n5vjcJc&W)_d z-6SPkN+L|2bK$+%*^3^mnxx+6JK`K(3E63_%}3dCMa*I#R-BfkIib-lC=X z2p?i*eWfb=EF$|$fr+nnZQj)MLS_p8yWNRFyN7NE7vx?V-kVSxHtUxdi)oA;R?7ju z*x6RK$9}*Z-dS>+drFpck2J>6Y1WijO<6$rbv{CAa|C>_O*bc3NAVxH_5Q6gxBEEfR3+JaTaN(H~`m4q2`IBR&kg4;!$clPEv40n-*XfKH@$iCA{>-6?!0 zU9f#EO;&T_jI7jD`KQ@xm;`#AEE##6O57QkFC_Tk?|^;Avsn|ymS`VNBBVF4NoHm? z0-!S`2BW%hP#4Z1`)!;#Q&04p#nG104Y4C1+>r>U&?qUAamATEBd#Hh#G4G6#VJjm zshGnYn@4392>G9-6=#<7upxAZH7X935-IPceiY)RC>J4Z(ma*YCNcNhLSnc+X=rP?gZeSMGO5w?xmLbp) zbOVyT86A7nzzPhJgfc?_AJIxst!q*A#-LHBV>aYv8C3YVC?U>C-A8i5R@2y+)5rIv z)reu&REc3t8N;nnWH>Y!Rqy45LA`X4SHaGaZECs2%VQrAJ{}iqw}?79H})UZ9Nr;S zR*Ld;QVg=W)^wiN0C(p0VRSpz;^o+y?2C1Fdf%}4hf)c}gC7o*Do_GMGyDVmHH@gU zW?R2{dC$z_Ao6e};cEE};WIDQo95CW@?c!j>DX|@#h0^21{OrMyZd)1&k&@M`*7CN zHyPvwNb$y7MzCn>GgM4!6yeJg`1)0A=!d59*|;ZAmaHap9vqOoxA+MWq;J6PYt>`&pC3@~9dem*KwS6k^So2TNgKL&%}_-45u# zI#}Qt8_|T6nvNeDF62nc38}7v{xTzSQWv+XbJZ}(SfKi3Q8*g~i{4gY-_{$;ruuBfo*WkpQ4* zoB8?qP0!5mrH)!xIEP;w=q=9rYQC@W47b_ZGa>IIBP%nDlgy<%n=Gj?^xI6kw3Z%#DDFEo=zL@q{M0;j-ft@cI0xw^}e{opGmgZDgDdFF*j z#tlszZFgN8%O=-%;yXZHTGC9kEvYoDB}RzEK}Y6ZWz{V|;TcN{hKGR)FT1P^2SD$y z>d#43NRZ~~k4$tj>MPVYMj7jd=69MOs%^On@et82&kfM7o(=Siop#+(y|R!~udO2n z=#k<#E>vt)Y-2ca_{yP`h0npfrE!M};z}_12QyRxG(~q4jhrb85ZM~kbS8FU(r zmyMjJr)D_V2zaNbf>Mvs(1wVkFJb#cN7($$j`OBP(_E~m%n($X`V830^77%;`MGk( zCc8^hqs>@mJgJEt!Qdq1OTsadIVUOJA;RbO?Kk4Pf6~5Yo8vj>@tQ+i*$u8`aDBKQ z9>gD}+^&{AyrmVH|HCo^D?fh$-GqK6d591zw%NQb1k6bI)mY*Gc$O99`%3Zq@e5SE z?VRYMw{C7`fbZ}sCdVL(38}OB;^fbC<|D^;ywco{-J5&s#ayKq?!+>@JjXS0Ri zV=|8i7c@zO*Fd%UJu_3se(4%*s*5SfzI3i~f@+<=@kwMh!&8$4^7qsyGjoj7=K~y0 z8WY&4`GEUn6yjMHQhnDNJn{{r$CVoYb)Q-X>~tdGGVVMSa`zF{lFY6&&0^)RU1c1C z5jNeFb&}x#sq1APrTJD&56H0pU2^H50*4F(V~a$%rr)23_o-bR$-NzB{Q7oQanKSH znIfuTRM)>p7IHlG?9a>Kv6=lp2y50)=i}wICzAzMHRjpqlYZ*p4685^=-<>SxZ~k( zp7}IYsyUuL6q+t+Kp-JSKSZalnYwRpj7Hjj`GpLk$yVVBEoY8iU0#w12@4nCQVF^H zy!3ediooL~tL`qcIbTjgt5Kd*&2FbaXSOt1?=;M4|JZliE>0w)Uf^VK{^<2*#q+A_ zC0IWT8%m6@&pij}ZxX)bA(VQX5q#*~t3n7Bzb=1!&)GmN+}KbdoIbm_!@7~wJI86r z$yC-Lx5?g9&E`ASaTAeHe(7%D#h+m}miw(OEG$ESF@Ko}n>h}Kuko3kfv!w|L8b{G zQ?d{X;oRR=^y#qUF^nO^*Z{abCY14z!=%s=P?06)H5L)^is_5VnIewtXY)>NS>+wA zov}hYGvIK1#R&8BK3L}1X8ddnFBu&6ax%f86(FfkwZSQqfF8CJf}`YX?YVO261cWv zWoUEq*zh~k_iXZ_Q0-h>P{foY;dj)?2N6>wZI6^Nn(?30acNmEUnhTv*w;T_ykSKS zZj*SAhiqy=!!DUPL0O1SKd#&a&6}>r?*~{zdw>H6xkc^~OJ2$`T>l=&G;(D_V&$LG zt+%+J!6MHCG!3l*(vz{V4l*vvXIkN%x>0n!g=B z@W=&R;_ywW{YZ?r(Vs2%WyG=?z{zqnbGu3>28WWY%{I5jjLf=JhAiW?o9xzy*L>pQ zV^*&v6QO-r#B?e@@m9n2RzR<3)M{lJyAepk!s6ne#%p%Z7gFE!pk@{b9-~!S-qbrn z*K|#>dvNLMJ9E_7z7I6R-r$&%d>O39mo-y(Soy8V*~`xw0NQj@;HqnYa2v<{6^HVB z>EG1k2gQK(d~1L@%?Dh=O%UN2JwIndqM)Z|MUVXaIVCKIdb-$4SUzIV^v$q^QqPzd z0WdtVWQ}d~{mdnA5{s#-qD=b=-(teVmzk*cvM%9}@4{-*$Y7krM`@Q!)RBPG#~N39 zT$!VV75|4b_MzhjqkPCLhTh*s#z8M=?;Yn$_tME`fV*Z^hTj8z~S+tiETfg;uc0Opism1P}dWGW;A@q)?!MlAl_OIfOaiP0ZRmxNmv z`kBV8s*;_N7V;&3mDNbE96BI-cHor;iIN9^*aLge9r7tk6rAlYEybvu=;Li8_y;tW zc;L-?i#}{l>qIhXPC(Ee`IYrr2&1DVG#n0Ti35IS(s@CjQ_JaqQvkXyr}|=~csWOF zzqjaQL+}jpx2;pU9-C_SGd-hI@HmzS-puPq&*H{Dk~J{0N-S8QdF9a-U!wLJX^^Xt z2njFiibWv*x61WUXG@TOSMsiEPaM}YV^m6XA$^s_*h4)J#M%=fcZfQ+g?q^%>D%X# zxK?Tk*r_vQ#|eyrU`9#YqOsS~6%T>63^EbNuchT~6r>5y1wl7I1PHo=A>-kpU zY!D?IxVkVC6k9pEmt{(fFs#2?`T}N9>PhL-NRWfjFFv#MYPukvt+jPuJ9tt+i$;zt z(lO4g|Gg@b#Ov0tOG`^PK)eMV>R6h^$;#uh9-Y$ ztOR0aqgpSmiaugP1k2qKByRK(XqY3E7g7wXKHZa;50eK&BUijPaIQ`_hZnB`v^{SV z0b0GfR85iGy5`;Ji0bsf4b0N<2V%b=ru0G;(*R~Y6E39ll%cjBf0*FOcL^O2KY2Kq z8#^K!bC^N0gkkTlrR8_x1x|;V<7*_q{T%*iwsY5>1!gF20P3l+o*rKL{@0@;XHn4m z2Ih~{5kt1y$9l%D=`grv=JtgWb4xT63Qe_>Fq&y(6p8i;F?tYBmMNk<`j;%<^N%hl ztB4Y0k(o|Qgb+r7ysK3T#+n5S7|#Lvh=XFoGQT63l}aC#rnL4`3Xe`Z2GN{L@x3gz zq%i5HnoaEBs5E%R!==lUCodFQHRfSN6`5V_WbiJ<3V=oT_V&JlVSi}(U&%`Ets zhI+Z40VzM9&jaDyGuT8+QH9HmljqaLw|jKpQ-8{mr6oMe#m2S30)T zG@)zkClq|qPVZ3JO3Ez2h{3;qXG(O1`}_NiAOMk`byf8#fK5*N76eL&npOS1n-J>V z1A#UE-JHiABnrUg9oT)Jzv3HF{G`yYES&JhjI16@k~1cLZE?8kVjO@b#iD9 z-7_sKYh|7X2x?cORR5J@YwI9^WMNWi%XgCmq2WXt);vXyf3PqiM6WGb^OALhEiudQ z)5`WeDJ`%i<%89al-?Dw{Dg#rcaF3+SX{XnAccSqPM+Ev#x@w<;k}X3FrhF#H@9ur z=-LIgDp2%spT)t7Iv6y3=m_A-sGv5HMVGW^MbTn-RK|l+a;5V2?83=g?@w!1zG&!t zm?~;$m;>x0R#<4UCmNC|SM+JT6&}yasGQ1Nn$+D;n#;pouWhdnnX&UkFI?trC6oDO zl=Hm5e7Uf|-Z#u{v;cw}7@uq2e5mjGc<=LmYlIxi$7l7tKN?KG#52!+K1mM9Wd9i) zkfKjYzC$ZsT3|;-RT#Gw10o^_-l5`w;crdlCCAPC9Q)(hZ-lp1E4X$UN4+E&xOkKm z=&DI~AWV5LDET2#Ey9al)%lAoA?hm6x|K!6Pb@+uL*WZta#H9H@4dOPH6r8jh10$y zv7uJJ0VCIX!4TsRP->e3i1^U<*)s@SwV(%RVc0l0Z~&(tPV?Y}7-0;HDECz+O5t^e z!rxykdOYB6xK!eG*ETfBg@uLLdwc6W!@>CnT5~l{@$^b=#^N2!yS%6)5NP9Xx{|NH z!w@888S#01%I~etD?73IT?}WV= zHPTz3G{x{sJiy5xTE@#^~lN~`1W%S{W5xdum@c``{lx=N$!2vUqJc)Xbo{cc!>%hN#H zKDi0Hq#s)Iw?Dr)=I9h;#(3rmY}yRl)y)5}{#550Z|~Cn^o*_=sHH%kte+i8oK1xC zd7#Ln6D%H>UYlSK+Cbu6=KGr#gzF;t?zpCvTJ4Mu$tRZK`HuSkv^YBS*zMgaMew!# zt*|xGb3Qt>n1{0}<(I{cFNI&+elUvdY#NqyYq6tF6)-H!r_1WLKq;d=uU4$vz^~8f*ES!4 z@0%AloX|lVH-FLNISVQjexaw)0y1nN6>#>0442{p7GyfEb zncMzek9O9Ki79cmo`ixVwXR|j6SfqYCY?WQ9ZaI3M;6gZ6v|^7X*Szp&%`(bv|;o*4-^4CmDWuIX%haNN@1|$K{1=HNCE|myt>- zMd^n&koud=^3nBT!_O8?Vl3m$VUof_7W8`jatlO1G^`sDEg~sa6oT*d%8I3TUolu- zsqm$w153aefZCfoIx2%TX81WXN}2ZHoSFNs1~=ic>FQh2FC_@PvFw<`Rz1Ap;vXY? zMlCEh7P$nuO|1$E2CClkzGL*m@YLvCi5k$;=5bJ6oa;&XBJsUd*OVV$E?cHuS4~%f zYq4_<)tIOYi*7!}u)j6EWfkmcS0MCPVU(GfDF!+Wm{E=8k;o1`FVAh( zlU0V*@^E*0p}+r25MUQ|jb{BfMrP_rkDzq$EMSL;9`d;!$LzK8WX`y4 zjeSs$2SK2y*zLrpE#Z}miO(U@+YPTq(8eL@wsRF2(3U{Bs?i`@l2QGx0w(sk`(UjD zmJ<5=xrsMLwGOc`_M(o0q;DVe{t-C-EO$XHS-jXUHPN|5RhvEbSq}G>0Yg@>24lt=D$__aYyDdu058=h5a6>GOt>d^3z<_9iD*f=(6z#|X6OI^(uL zYKY{P0+)wC&GEWqiJH@E19cgEy1Yrdu6IGS+lAv^rCLIux4=cWwk_&nHah3NFw?yi z$SLs_amP;nPYM2j?2BL(emkNmOP)LEPCCs|vA@1&t2{5?9~~Mfz5=@=j@aG8*k#A* z5Nl87wiPHC&p_gTfBx;$`P;V#-gZ?a1R?1O2*7mWQ82Yj+y8#Co9mpapB#y6*>}~z z){L3J3el11KPv=Wc`FS%Z4q}PSmSTVJo6$l8_CqYV0%sqOQA=l2a>jM8qnbYpn_x; zmP5P#O*`9Qhs6Q<2f4NL%bf1Lmv!UapshuL3a0%6N%jqh&_u$C@!K$I+@JRYRj3$^ z+TWE5`klSj)osJt9P)UvKer3?E?;YF#+aOeApmp-18BU#s20lLjwwRN?1)_2o5Wz1 z&?s+PTib6@|2ab`sHlj+OU09N1&O<#&c)xBq_CDE(wzaxx%c?~*YUY=yZ`H%r6tOC z083AQ4d%WaIY|DI!U9&x|NYHhJQQx{>)RX#M+2i;Xn4GIC?e{|yJaVQKNG|ma?GVF z=3U~eqXlCtB5aEBY&$KrM{0zP>x5fi?e~q=VtZ?b!2No-o-^iP^BR(@zwC>WP`uEl zQT%pcT_D?f zdZtcv!IZh*tXk)E_jTK6xnAYL;}=!!tg+(my5OJIs}-wvM>%GwS0~q?9}01iZHIKH`@M&DxZoQd(3)284sG|>JO$5`k?J} zf!*Uecy_O$O^hbd8bNk~q~{RUe*CsC?akNxPtE1jKZ79u=j&;Vvu!k)#Rcit`~Ut< NK}J=&T*@@`{{a=lEI$AM diff --git a/docs/index-static.html.in b/docs/index-static.html.in index 75b4bdb..9127121 100644 --- a/docs/index-static.html.in +++ b/docs/index-static.html.in @@ -80,7 +80,7 @@ -->
  •   Shortcut Coverage
    • -
  •   Environment
    •   Environment
  •   Extending
  •   Directory Overview
    • @@ -90,7 +90,7 @@
  •     Pixel formats
    • - +
    @@ -103,7 +103,7 @@

    It allows converting between different methods of storing pixels known as pixel formats that have with different bitdepths and other data representations, color models and - component permutations. + component permutations.

    A vocabulary to formulate new pixel formats from existing primitives is provided as well as the framework to add new color models and @@ -140,7 +140,7 @@

  • ANSI C, works on win32, linux and mac, 32bit and 64bit systems.
  • Extendable with new formats, color models, components and datatypes.
    • -
  • Reference 64bit floating point conversions for datatypes and color models. +
  • Reference 64bit floating point conversions for datatypes and color models.

    • GEGL through babl_format ("R'G'B' u8"); const Babl *lab = babl_format ("CIE Lab float"); -const Babl *rgb_to_lab_fish = babl_fish (srgb, lab); +Babl *rgb_to_lab_fish = babl_fish (srgb, lab); float *lab_buffer; unsigned char *srgb_buffer; -srgb_buffer = malloc (pixel_count * srgb->format.bytes_per_pixel); -lab_buffer = malloc (pixel_count * 3 * 4); +babl_init (); + +srgb_buffer = malloc (pixel_count * babl_format_get_bytes_per_pixel (srgb)); +lab_buffer = malloc (pixel_count * 3 * sizeof (float)); ...... load data into srgb_buffer ....... -babl_process (bablfish, srgb_buffer, lab_buffer, pixel_count); +babl_process (rgb_to_lab_fish, srgb_buffer, lab_buffer, pixel_count); ...... do operation in lab space ........ -babl_process (babl_fish(lab, srgb), +babl_process (babl_fish(lab, srgb), lab_buffer, srgb_buffer, pixel_count); /* the data has now been transformed back to srgb data */ diff --git a/extensions/Makefile.in b/extensions/Makefile.in index 96a12bc..da448e2 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -202,6 +202,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -231,6 +232,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -239,6 +241,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -326,9 +329,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu extensions/Makefile + $(AUTOMAKE) --foreign extensions/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/extensions/gggl.c b/extensions/gggl.c index a9d163d..d9d9ca1 100644 --- a/extensions/gggl.c +++ b/extensions/gggl.c @@ -625,49 +625,6 @@ conv_rgbAF_rgbaF (unsigned char *src, unsigned char *dst, long samples) } -static INLINE long -conv_rgbAF_rgbF (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - float alpha = (((float *) src)[3]); - if (alpha >= 1.0) - { - register int c; - for (c = 0; c < 3; c++) - { - *(float *) dst = *(float *) src; - dst += 4; - src += 4; - } - } - else if (alpha <= 0.0) - { - register int c; - for (c = 0; c < 3; c++) - { - *(float *) dst = 0; - dst += 4; - src += 4; - } - } - else - { - register int c; - for (c = 0; c < 3; c++) - { - *(float *) dst = ((*(float *) src) / alpha); - dst += 4; - src += 4; - } - } - src += 4; - } - return samples; -} - static INLINE long conv_rgbaF_rgbAF (unsigned char *src, unsigned char *dst, long samples) { @@ -788,10 +745,8 @@ conv_gF_gaF (unsigned char *src, unsigned char *dst, long samples) return samples; } -#define conv_gAF_gF conv_gaF_gF #define conv_gF_gAF conv_gF_gaF -#define conv_rgbAF_rgbF conv_rgbaF_rgbF #define conv_rgbF_rgbAF conv_rgbF_rgbaF /* colorchannel dropping and adding */ @@ -815,28 +770,6 @@ conv_gF_rgbF (unsigned char *src, unsigned char *dst, long samples) return samples; } -static INLINE long -conv_rgbF_gF (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - int c; - float sum = 0; - - for (c = 0; c < 3; c++) - { - sum += (*(float *) src); - src += 4; - } - sum /= 3.0; - (*(float *) dst) = sum; - dst += 4; - } - return samples; -} - static INLINE long conv_gaF_rgbaF (unsigned char *src, unsigned char *dst, long samples) { @@ -859,57 +792,10 @@ conv_gaF_rgbaF (unsigned char *src, unsigned char *dst, long samples) return samples; } -static INLINE long -conv_rgbaF_gaF (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - float gray = 0; - - gray += (*(float *) src) * 0.212671; - src += 4; - gray += (*(float *) src) * 0.715160; - src += 4; - gray += (*(float *) src) * 0.072169; - src += 4; - (*(float *) dst) = gray; - dst += 4; - (*(int *) dst) = (*(int *) src); - dst += 4; - src += 4; - } - return samples; -} - #define conv_gAF_rgbAF conv_gaF_rgbaF -#define conv_rgbAF_gAF conv_rgbaF_gaF /* other conversions coded for some optimisation reason or sumthin */ -static INLINE long -conv_rgbA8_rgbaF (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - float alpha = (*(unsigned char *) src + (3)) / 255.0; - int c; - - for (c = 0; c < 3; c++) - { - (*(float *) dst) = (*(unsigned char *) src / 255.0) / alpha; - dst += 4; - src += 1; - } - *(float *) dst = alpha; - dst += 4; - src += 1; - } - return samples; -} static INLINE long conv_rgbaF_rgbA8 (unsigned char *src, unsigned char *dst, long samples) @@ -984,28 +870,6 @@ conv_rgbaF_rgb8 (unsigned char *src, unsigned char *dst, long samples) } #endif -static INLINE long -conv_rgbaF_g8 (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - int c; - float sum = 0; - - for (c = 0; c < 3; c++) - { - sum += (*(float *) src); - src += 4; - } - *(unsigned char *) dst = sum * 255.0 / 3; - dst++; - src += 4; - } - return samples; -} - static INLINE long conv_rgbaF_rgb16 (unsigned char *src, unsigned char *dst, long samples) { @@ -1350,29 +1214,6 @@ conv_rgb8_Prgb8 (unsigned char *src, unsigned char *dst, long samples) return samples; } -static INLINE long -conv_rgbA16_rgba16 (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - if (src[3]) - { - ((unsigned short *) dst)[0] = - (((unsigned short *) src)[0] * 65535) / src[3]; - ((unsigned short *) dst)[1] = - (((unsigned short *) src)[1] * 65535) / src[3]; - ((unsigned short *) dst)[2] = - (((unsigned short *) src)[2] * 65535) / src[3]; - } - ((unsigned short *) dst)[3] = ((unsigned short *) src)[3]; - dst += 8; - src += 8; - } - return samples; -} - static INLINE long conv_rgb8_rgbP8 (unsigned char *src, unsigned char *dst, long samples) { @@ -1523,76 +1364,9 @@ conv_rgbA8_rgb8 (unsigned char *src, unsigned char *dst, long samples) byteclamp (V); \ } while (0) -static INLINE long -conv_yuv8_rgb8 (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - int R, G, B; - - YUV82RGB8 (src[0], src[1], src[2], R, G, B); - dst[0] = R; - dst[1] = G; - dst[2] = B; - src += 3; - dst += 3; - } - return samples; -} - -static INLINE long -conv_rgb8_yuv8 (unsigned char *src, unsigned char *dst, long samples) -{ - long n = samples; - - while (n--) - { - int Y, U, V; - - YUV82RGB8 (src[0], src[1], src[2], Y, U, V); - dst[0] = Y; - dst[1] = U; - dst[2] = V; - src += 3; - dst += 3; - } - return samples; -} - -static INLINE long -conv_rgbaF_yuvaF (unsigned char *src, unsigned char *dst, long samples) -{ - float *src_f = (float *) src; - float *dst_f = (float *) dst; - long n = samples; - - while (n--) - { - float R, G, B; - float Y, U, V; - - R = src_f[0]; - G = src_f[1]; - B = src_f[2]; - Y = 0.299 * R + 0.587 * B + 0.114 * B; - U = (-0.1687) * R - 0.3313 * G + 0.5 * B /* +0.5 */; - V = 0.5 * R - 0.4187 * G - 0.0813 * B /* +0.5 */; - dst_f[0] = Y; - dst_f[1] = U; - dst_f[2] = V; - dst_f[3] = src_f[3]; - - dst_f += 4; - src_f += 4; - } - return samples; -} - -static INLINE long + static INLINE long conv_yuvaF_rgbaF (unsigned char *src, unsigned char *dst, long samples) { float *src_f = (float *) src; @@ -1624,37 +1398,6 @@ conv_yuvaF_rgbaF (unsigned char *src, unsigned char *dst, long samples) } - -static INLINE long -conv_rgbF_yuvF (unsigned char *src, unsigned char *dst, long samples) -{ - float *src_f = (float *) src; - float *dst_f = (float *) dst; - long n = samples; - - while (n--) - { - float R, G, B; - float Y, U, V; - - R = src_f[0]; - G = src_f[1]; - B = src_f[2]; - - Y = 0.299 * R + 0.587 * B + 0.114 * B; - U = (-0.1687) * R - 0.3313 * G + 0.5 * B /* +0.5 */; - V = 0.5 * R - 0.4187 * G - 0.0813 * B /* +0.5 */; - - dst_f[0] = Y; - dst_f[1] = U; - dst_f[2] = V; - - dst_f += 3; - src_f += 3; - } - return samples; -} - static INLINE long conv_yuvF_rgbF (unsigned char *src, unsigned char *dst, long samples) { @@ -2015,18 +1758,6 @@ init (void) babl_type ("u8"), babl_component ("Y'"), NULL); - Babl *yuv8 = babl_format_new ( - "name", "Y'CbCr u8", - "planar", - babl_model ("Y'CbCr"), - babl_type ("u8-luma"), - babl_sampling (1, 1), - babl_component ("Y'"), - babl_type ("u8-chroma"), - babl_sampling (2, 2), - babl_component ("Cb"), - babl_component ("Cr"), - NULL); Babl *yuvF = babl_format_new ( babl_model ("Y'CbCr"), babl_type ("float"), @@ -2082,10 +1813,7 @@ init (void) o (g16, g8); o (rgbaF, rgbAF); o (rgbAF, rgbaF); - o (yuv8, rgb8); - o (rgb8, yuv8); o (yuvF, rgbF); - o (rgbF, yuvF); o (yuvaF, rgbaF); o (rgbA8, rgbA16); o (rgb8, rgb16); @@ -2109,47 +1837,33 @@ init (void) o (gaF, gAF); o (gAF, gaF); o (rgbaF, rgbF); - o (rgbAF, rgbF); o (gaF, gF); - o (gAF, gF); o (rgbF, rgbaF); o (rgbF, rgbAF); o (gF, gaF); o (gF, gAF); - o (rgbF, gF); o (gF, rgbF); - o (rgbaF, gaF); o (gaF, rgbaF); - o (rgbAF, gAF); o (gAF, rgbAF); o (rgbaF, rgb8); - o (rgbA8, rgbaF); o (rgbA8, rgbAF); o (ga8, gaF); o (gA8, gAF); o (rgbA8, rgba8); o (rgba8, rgbA8); - o (rgbA16, rgba16); o (gAF, rgbAF); - o (rgbaF, g8); o (rgbaF, rgb16); o (rgb8, rgba8); o (rgb8, rgbA8); o (rgbA8, rgb8); o (rgba8, rgb8); o (rgbaF, rgbA8); - o (rgbaF, rgbA16); o (rgbA16, rgbaF); - o (yuv8, rgb8); - o (rgb8, yuv8); o (yuvF, rgbF); - o (rgbF, yuvF); o (yuvaF, rgbaF); - o (rgbaF, yuvaF); o (rgbaF, rgbaD); o (rgbaD, rgbaF); o (rgbaF, rgb8); - o (rgbAF, rgbF); #if 0 o (rgbF, xyzF); o (xyzF, rgbF); diff --git a/ltmain.sh b/ltmain.sh old mode 100755 new mode 100644 index d8efb57..c7d06c3 --- a/ltmain.sh +++ b/ltmain.sh @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.2.10 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -42,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -70,17 +70,19 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.10 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 # automake: $automake_version # autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.10 +VERSION="2.4.2 Debian-2.4.2-1" TIMESTAMP="" -package_revision=1.3175 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -135,15 +137,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -163,6 +160,27 @@ IFS=" $lt_nl" dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -177,17 +195,31 @@ basename="s,^.*/,," # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation -# Generated shell functions inserted here. # These SED scripts presuppose an absolute path with a trailing slash. pathcar='s,^/\([^/]*\).*$,\1,' @@ -351,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -370,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -398,7 +439,7 @@ opt_warning=: # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -424,14 +465,14 @@ func_echo_all () # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -650,11 +691,30 @@ func_show_eval_locale () fi } +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + # func_version # Echo version message to standard output and exit. func_version () { + $opt_debug + $SED -n '/(C)/!b go :more /\./!{ @@ -676,6 +736,8 @@ func_version () # Echo short help message to standard output and exit. func_usage () { + $opt_debug + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// @@ -692,7 +754,10 @@ func_usage () # unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -702,10 +767,14 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" ret=$? if test -z "$1"; then exit $ret @@ -717,12 +786,39 @@ func_help () # exit_cmd. func_missing_arg () { + $opt_debug + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: @@ -732,25 +828,64 @@ magic="%%%MAGIC variable%%%" magic_exe="%%%MAGIC EXE variable%%%" # Global variables. -# $mode is unset nonopt= -execute_dlfiles= preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" extracted_archives= extracted_serial=0 -opt_dry_run=false -opt_duplicate_deps=false -opt_silent=false -opt_debug=: - # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. exec_cmd= +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -840,129 +975,209 @@ func_enable_tag () esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Parse non-mode specific arguments: - while test "$#" -gt 0; do +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: - opt_verbose=false + opt_preserve_dup_deps=: ;; - - --no-quiet|--no-silent) - preserve_args="$preserve_args $opt" - opt_silent=false + --features) + opt_features=: +func_features ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false - opt_verbose=: +func_append preserve_args " $opt" ;; - - --no-verbose) preserve_args="$preserve_args $opt" + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) opt_verbose=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --help-all) opt_help=': help-all' ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -970,82 +1185,44 @@ func_enable_tag () opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} - - -## ----------- ## -## Main. ## -## ----------- ## + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" -$opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1110,12 +1287,9 @@ func_ltwrapper_executable_p () # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1161,6 +1335,37 @@ func_source () } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1173,8 +1378,7 @@ func_infer_tag () if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1193,8 +1397,7 @@ func_infer_tag () CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done CC_expanded=`func_echo_all $CC` CC_quoted_expanded=`func_echo_all $CC_quoted` @@ -1238,30 +1441,510 @@ func_write_libtool_object () write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 - $opt_dry_run || { - cat >${write_libobj}T < "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1515,7 +2195,7 @@ compiler." if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1562,11 +2242,11 @@ compiler." command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1611,13 +2291,13 @@ compiler." } $opt_help || { - test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1793,7 +2473,7 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac @@ -1808,13 +2488,13 @@ if $opt_help; then else { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done } | sed -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit - for mode in compile link execute install finish uninstall clean; do + for opt_mode in compile link execute install finish uninstall clean; do echo func_mode_help done @@ -1843,13 +2523,16 @@ func_mode_execute () func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1871,7 +2554,7 @@ func_mode_execute () dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1928,8 +2611,7 @@ func_mode_execute () ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1961,22 +2643,59 @@ func_mode_execute () fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libdirs="$nonopt" + libs= + libdirs= admincmds= - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1986,7 +2705,7 @@ func_mode_finish () if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -1995,53 +2714,55 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2066,7 +2787,7 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -2086,7 +2807,7 @@ func_mode_install () do arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -2124,11 +2845,11 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then func_quote_for_eval "$arg2" fi - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2140,7 +2861,7 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else func_quote_for_eval "$install_override_mode" - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -2198,10 +2919,13 @@ func_mode_install () case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2215,19 +2939,19 @@ func_mode_install () if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. @@ -2304,7 +3028,7 @@ func_mode_install () func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2478,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -2501,7 +3227,7 @@ func_mode_install () fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2548,6 +3274,18 @@ extern \"C\" { #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2559,8 +3297,9 @@ extern \"C\" { # Add our own program objects to the symbol list. progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2609,10 +3348,52 @@ extern \"C\" { func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2650,26 +3431,9 @@ typedef struct { const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - echo >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - echo >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2709,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -2725,7 +3489,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2788,7 +3552,8 @@ func_win32_libid () # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - win32_nmres=`eval $NM -f posix -A $1 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2817,6 +3582,131 @@ func_win32_libid () $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -3095,14 +3985,17 @@ func_exec_program_core () # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -3195,6 +4088,18 @@ func_exec_program () if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -3209,14 +4114,6 @@ func_exec_program () " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. @@ -3234,166 +4131,6 @@ fi\ } -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_result=`cygpath -w "$1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result= - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path - -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - func_to_host_pathlist_result=` - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result"; then - func_error "Could not determine the host path(s) corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_append func_to_host_pathlist_result ";" - ;; - esac - ;; - esac - fi -} -# end: func_to_host_pathlist - # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout # Must ONLY be called from within func_mode_link because @@ -3563,14 +4300,14 @@ void lt_dump_script (FILE *f); EOF cat </dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -6999,7 +7833,7 @@ EOF if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7024,7 +7858,7 @@ EOF ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7040,7 +7874,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -7053,7 +7887,7 @@ EOF potlib="$potent_lib" # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -7078,7 +7912,7 @@ EOF ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -7182,7 +8016,7 @@ EOF *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7192,10 +8026,10 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -7207,15 +8041,22 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -7224,18 +8065,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -7243,17 +8084,13 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -7261,7 +8098,7 @@ EOF fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -7287,7 +8124,7 @@ EOF linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic @@ -7298,7 +8135,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7329,13 +8166,45 @@ EOF $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7369,7 +8238,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7379,7 +8248,7 @@ EOF case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7399,21 +8268,21 @@ EOF test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7475,10 +8344,13 @@ EOF echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done echo ')' >> $output - delfiles="$delfiles $output" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7492,10 +8364,12 @@ EOF fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7546,7 +8420,7 @@ EOF if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7580,7 +8454,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7613,7 +8487,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7654,10 +8528,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7673,7 +8547,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7685,7 +8559,7 @@ EOF IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7769,13 +8643,16 @@ EOF reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test @@ -7849,8 +8726,8 @@ EOF if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi @@ -7870,7 +8747,7 @@ EOF *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7880,17 +8757,17 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7898,7 +8775,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7917,18 +8794,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7937,12 +8814,12 @@ EOF case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7968,18 +8845,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -8030,6 +8907,12 @@ EOF exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8052,7 +8935,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8060,7 +8943,7 @@ EOF # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8075,6 +8958,13 @@ EOF $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -8108,6 +8998,12 @@ EOF func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -8205,7 +9101,7 @@ EOF else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -8213,10 +9109,10 @@ EOF if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -8227,10 +9123,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -8248,7 +9144,7 @@ EOF else echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -8272,18 +9168,30 @@ EOF esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8377,12 +9285,23 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8396,9 +9315,9 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8415,7 +9334,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8427,7 +9346,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8436,7 +9355,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi @@ -8521,7 +9440,7 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8541,9 +9460,9 @@ func_mode_uninstall () for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8552,24 +9471,23 @@ func_mode_uninstall () rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8595,18 +9513,17 @@ func_mode_uninstall () # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8634,19 +9551,19 @@ func_mode_uninstall () # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8656,7 +9573,7 @@ func_mode_uninstall () noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8665,7 +9582,7 @@ func_mode_uninstall () func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8673,12 +9590,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8686,7 +9603,6 @@ func_mode_uninstall () esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8698,16 +9614,16 @@ func_mode_uninstall () exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff --git a/m4/introspection.m4 b/m4/introspection.m4 old mode 100755 new mode 100644 diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 8c99a62..828104c 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -168,10 +170,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -634,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -748,15 +753,12 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ m4_defun([_LT_LANG], ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1073,30 +1117,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], fi ]) -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi ])# _LT_SYS_MODULE_PATH_AIX @@ -1121,7 +1176,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO AC_MSG_CHECKING([how to print strings]) # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -1165,6 +1220,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + # _LT_ENABLE_LOCK # --------------- m4_defun([_LT_ENABLE_LOCK], @@ -1286,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1311,14 +1412,47 @@ need_locks="$enable_libtool_lock" ])# _LT_ENABLE_LOCK +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) +[_LT_PROG_AR AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1337,13 +1471,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1523,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1562,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -1658,10 +1797,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -2108,7 +2247,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2117,7 +2256,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2182,7 +2321,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2201,8 +2340,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2235,13 +2375,71 @@ m4_if([$1], [],[ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2262,7 +2460,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2270,10 +2468,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2281,7 +2475,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2299,7 +2493,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2319,17 +2513,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2390,7 +2585,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2406,7 +2601,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2443,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2474,14 +2669,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2493,6 +2684,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -2512,7 +2715,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2581,7 +2784,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2606,7 +2809,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2630,7 +2833,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2661,7 +2864,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2671,7 +2874,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2949,6 +3152,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -3088,12 +3296,12 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3167,6 +3375,21 @@ tpf*) ;; esac ]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3174,7 +3397,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3277,6 +3504,67 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + # LT_LIB_M # -------- @@ -3403,8 +3691,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3428,6 +3716,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -3440,6 +3729,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3473,6 +3763,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -3484,7 +3786,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT@&t@_DLSYM_CONST struct { const char *name; void *address; } @@ -3510,15 +3812,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3551,6 +3853,13 @@ else AC_MSG_RESULT(ok) fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3561,6 +3870,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3572,7 +3883,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= -AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3677,6 +3987,12 @@ m4_if([$1], [CXX], [ ;; esac ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; dgux*) case $cc_basename in ec++*) @@ -3797,7 +4113,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3985,7 +4301,9 @@ m4_if([$1], [CXX], [ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4051,6 +4369,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4071,18 +4395,33 @@ m4_if([$1], [CXX], [ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4170,9 +4509,11 @@ case $host_os in _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) # # Check to make sure the PIC flag actually works. @@ -4191,6 +4532,8 @@ fi _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4211,6 +4554,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4219,6 +4563,7 @@ m4_require([_LT_TAG_COMPILER])dnl AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. @@ -4233,15 +4578,25 @@ m4_if([$1], [CXX], [ ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4256,7 +4611,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4301,6 +4655,9 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4409,7 +4766,8 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4457,7 +4815,7 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -4506,8 +4864,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -4522,13 +4879,13 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4546,8 +4903,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4593,8 +4950,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4699,6 +5056,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4724,7 +5082,7 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else @@ -4735,7 +5093,7 @@ _LT_EOF else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. @@ -4779,20 +5137,64 @@ _LT_EOF # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac ;; darwin* | rhapsody*) @@ -4805,10 +5207,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -4821,7 +5219,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -4830,7 +5228,7 @@ _LT_EOF # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4838,7 +5236,7 @@ _LT_EOF hpux9*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -4854,13 +5252,12 @@ _LT_EOF hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -4878,10 +5275,10 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -4928,16 +5325,31 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -4949,7 +5361,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5022,7 +5434,7 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' @@ -5041,9 +5453,9 @@ _LT_EOF _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5287,9 +5699,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5315,8 +5724,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5327,6 +5734,8 @@ _LT_TAGDECL([], [include_expsyms], [1], [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5428,6 +5837,7 @@ CC="$lt_save_CC" m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then @@ -5446,7 +5856,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5489,6 +5898,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5506,6 +5916,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5527,8 +5938,8 @@ if test "$_lt_caught_CXX_error" != yes; then # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5669,7 +6080,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -5681,7 +6092,7 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX + _LT_SYS_MODULE_PATH_AIX([$1]) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. @@ -5723,29 +6134,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -5768,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -5820,7 +6277,7 @@ if test "$_lt_caught_CXX_error" != yes; then ;; *) if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -5891,10 +6348,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -5935,9 +6392,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6215,7 +6672,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6302,9 +6759,9 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6433,6 +6890,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6447,6 +6905,29 @@ AC_LANG_POP ])# _LT_LANG_CXX_CONFIG +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6455,6 +6936,7 @@ AC_LANG_POP # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6504,7 +6986,20 @@ public class foo { } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -6516,7 +7011,7 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case $p in + case ${prev}${p} in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -6525,13 +7020,22 @@ if AC_TRY_EVAL(ac_compile); then test $p = "-R"; then prev=$p continue - else - prev= fi + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) + case ${prev} in + -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -6551,8 +7055,10 @@ if AC_TRY_EVAL(ac_compile); then _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi + prev= ;; + *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -6588,6 +7094,7 @@ else fi $RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -6687,7 +7194,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6737,7 +7243,9 @@ if test "$_lt_disable_F77" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} + CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -6791,6 +7299,7 @@ if test "$_lt_disable_F77" != yes; then GCC=$lt_save_GCC CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP @@ -6817,7 +7326,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -6867,7 +7375,9 @@ if test "$_lt_disable_FC" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} + CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -6923,7 +7433,8 @@ if test "$_lt_disable_FC" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -6960,10 +7471,12 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -6994,10 +7507,82 @@ fi AC_LANG_RESTORE GCC=$lt_save_GCC -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7029,9 +7614,11 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} +CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7044,7 +7631,8 @@ fi GCC=$lt_save_GCC AC_LANG_RESTORE -CC="$lt_save_CC" +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG @@ -7064,6 +7652,13 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7103,6 +7698,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) # _LT_DECL_SED # ------------ @@ -7196,8 +7800,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7236,206 +7840,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -} + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -_LT_EOF -esac + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac ;; - esac + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac ]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 17cfd51..5d9acd8 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 93fc771..07a8602 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3175 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.10]) -m4_define([LT_PACKAGE_REVISION], [1.3175]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.10' -macro_revision='1.3175' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/tests/Makefile.in b/tests/Makefile.in index 4512b46..d8ca58e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -272,6 +272,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ @@ -301,6 +302,7 @@ SHELL = @SHELL@ SHREXT = @SHREXT@ SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@ STRIP = @STRIP@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ @@ -309,6 +311,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -376,9 +379,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile + $(AUTOMAKE) --foreign tests/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -- 2.30.2